[Checkins] SVN: zc.beforestorage/trunk/ Updated to work with both ZODB 3.8 and 3.9.

[Jim Fulton]

Log message for revision 93645:
  Updated to work with both ZODB 3.8 and 3.9.
  

Changed:
  U   zc.beforestorage/trunk/buildout.cfg
  U   zc.beforestorage/trunk/src/zc/beforestorage/README.txt
  U   zc.beforestorage/trunk/src/zc/beforestorage/__init__.py

-=-
Modified: zc.beforestorage/trunk/buildout.cfg
===================================================================
--- zc.beforestorage/trunk/buildout.cfg	2008-12-05 14:39:14 UTC (rev 93644)
+++ zc.beforestorage/trunk/buildout.cfg	2008-12-05 15:00:09 UTC (rev 93645)
@@ -1,10 +1,10 @@
 [buildout]
 develop = .
 parts = test py
-versions = versions
+#versions = versions
 
 [versions]
-ZODB3 = 3.8.0c1
+ZODB3 = 3.8.1
 
 [py]
 recipe = zc.recipe.egg

Modified: zc.beforestorage/trunk/src/zc/beforestorage/README.txt
===================================================================
--- zc.beforestorage/trunk/src/zc/beforestorage/README.txt	2008-12-05 14:39:14 UTC (rev 93644)
+++ zc.beforestorage/trunk/src/zc/beforestorage/README.txt	2008-12-05 15:00:09 UTC (rev 93645)
@@ -40,6 +40,11 @@
 Change history
 ==============
 
+0.3.2 (2008-12-05)
+******************
+
+Updated to work with both ZODB 3.8 and 3.9.
+
 0.3.1 (2008-12-01)
 ******************
 
@@ -226,8 +231,9 @@
 
 Let's run through the storage methods:
 
-    >>> b5.getName()
-    'Data.fs before 2008-01-21 18:23:04.000000'
+    >>> (b5.getName() == 
+    ...  'Data.fs before %s' % ZODB.TimeStamp.TimeStamp(transactions[5]))
+    True
 
     >>> b5.getSize() == fs.getSize()
     True
@@ -357,7 +363,9 @@
 example:
 
     >>> fs = ZODB.FileStorage.FileStorage('Data.fs')
-    >>> b5 = zc.beforestorage.Before(fs, '2008-01-21T18:23:04')
+    >>> iso = 'T'.join(str(ZODB.TimeStamp.TimeStamp(transactions[5])).split()
+    ...                )[:19]
+    >>> b5 = zc.beforestorage.Before(fs, iso)
     >>> db5 = DB(b5)
     >>> conn5 = db5.open()
     >>> root5 = conn5.root()

Modified: zc.beforestorage/trunk/src/zc/beforestorage/__init__.py
===================================================================
--- zc.beforestorage/trunk/src/zc/beforestorage/__init__.py	2008-12-05 14:39:14 UTC (rev 93644)
+++ zc.beforestorage/trunk/src/zc/beforestorage/__init__.py	2008-12-05 15:00:09 UTC (rev 93645)
@@ -52,6 +52,9 @@
         if ZODB.interfaces.IBlobStorage.providedBy(storage):
             self.loadBlob = storage.loadBlob
             self.temporaryDirectory = storage.temporaryDirectory
+            if hasattr(storage, 'openCommittedBlobFile'):
+                self.openCommittedBlobFile = storage.openCommittedBlobFile
+            
             zope.interface.alsoProvides(self, ZODB.interfaces.IBlobStorage)
             
 
@@ -78,7 +81,7 @@
 
         s = size
         while 1:
-            base_history = self.storage.history(oid, version='', size=s)
+            base_history = self.storage.history(oid, size=s)
             result = [d for d in base_history
                       if d['tid'] < self.before
                       ]