[Checkins] SVN: zc.relationship/branches/1.1/ Add ZODB 3.7 support

[Martin Aspeli]

Log message for revision 98174:
  Add ZODB 3.7 support

Changed:
  U   zc.relationship/branches/1.1/CHANGES.txt
  U   zc.relationship/branches/1.1/setup.py
  U   zc.relationship/branches/1.1/src/zc/relationship/__init__.py

-=-
Modified: zc.relationship/branches/1.1/CHANGES.txt
===================================================================
--- zc.relationship/branches/1.1/CHANGES.txt	2009-03-16 22:47:55 UTC (rev 98173)
+++ zc.relationship/branches/1.1/CHANGES.txt	2009-03-17 02:54:58 UTC (rev 98174)
@@ -10,6 +10,9 @@
 1.1.1
 -----
 
+- Add support for both ZODB 3.7 and ZODB 3.8 via a small import location
+  monkey patch.
+
 - Fix name errors caught by pyflakes.
 
 1.1.0

Modified: zc.relationship/branches/1.1/setup.py
===================================================================
--- zc.relationship/branches/1.1/setup.py	2009-03-16 22:47:55 UTC (rev 98173)
+++ zc.relationship/branches/1.1/setup.py	2009-03-17 02:54:58 UTC (rev 98174)
@@ -20,7 +20,7 @@
     license='ZPL 2.1',
     keywords="zope zope3",
     install_requires=[
-        'ZODB3 >= 3.8dev',
+        'ZODB3',
         'zope.app.container', # would be nice to remove this
         'zope.app.intid',
         'zope.interface',

Modified: zc.relationship/branches/1.1/src/zc/relationship/__init__.py
===================================================================
--- zc.relationship/branches/1.1/src/zc/relationship/__init__.py	2009-03-16 22:47:55 UTC (rev 98173)
+++ zc.relationship/branches/1.1/src/zc/relationship/__init__.py	2009-03-17 02:54:58 UTC (rev 98174)
@@ -18,3 +18,33 @@
 from zc.relationship.index import Index
 from zc.relationship.shared import Relationship
 from zc.relationship.intid import Container
+
+# A tiny monkey patch due to some re-organization of future BTree modules
+try:
+    from BTrees.OOBTree import BTree
+except ImportError:
+    import BTrees.OOBTree
+    import BTrees.IOBTree
+    import BTrees.OIBTree
+    import BTrees.IIBTree
+    import BTrees.IFBTree
+    BTrees.OOBTree.BTree = BTrees.OOBTree.OOBTree
+    BTrees.OOBTree.Set = BTrees.OOBTree.OOSet
+    BTrees.OOBTree.Bucket = BTrees.OOBTree.OOBucket
+    BTrees.OOBTree.TreeSet = BTrees.OOBTree.OOTreeSet
+    BTrees.IOBTree.BTree = BTrees.IOBTree.IOBTree
+    BTrees.IOBTree.Set = BTrees.IOBTree.IOSet
+    BTrees.IOBTree.Bucket = BTrees.IOBTree.IOBucket
+    BTrees.IOBTree.TreeSet = BTrees.IOBTree.IOTreeSet
+    BTrees.OIBTree.BTree = BTrees.OIBTree.OIBTree
+    BTrees.OIBTree.Set = BTrees.OIBTree.OISet
+    BTrees.OIBTree.Bucket = BTrees.OIBTree.OIBucket
+    BTrees.OIBTree.TreeSet = BTrees.OIBTree.OITreeSet
+    BTrees.IIBTree.BTree = BTrees.IIBTree.IIBTree
+    BTrees.IIBTree.Set = BTrees.IIBTree.IISet
+    BTrees.IIBTree.Bucket = BTrees.IIBTree.IIBucket
+    BTrees.IIBTree.TreeSet = BTrees.IIBTree.IITreeSet
+    BTrees.IFBTree.BTree = BTrees.IFBTree.IFBTree
+    BTrees.IFBTree.Set = BTrees.IFBTree.IFSet
+    BTrees.IFBTree.Bucket = BTrees.IFBTree.IFBucket
+    BTrees.IFBTree.TreeSet = BTrees.IFBTree.IFTreeSet