[Checkins] SVN: tempstorage/trunk/ Require at least ZODB 3.9 and adjusted method signatures to disuse versions.

[Hanno Schlichting]

Log message for revision 116905:
  Require at least ZODB 3.9 and adjusted method signatures to disuse versions.
  

Changed:
  U   tempstorage/trunk/CHANGES.txt
  U   tempstorage/trunk/setup.py
  U   tempstorage/trunk/src/tempstorage/TemporaryStorage.py

-=-
Modified: tempstorage/trunk/CHANGES.txt
===================================================================
--- tempstorage/trunk/CHANGES.txt	2010-09-25 13:20:53 UTC (rev 116904)
+++ tempstorage/trunk/CHANGES.txt	2010-09-25 13:21:09 UTC (rev 116905)
@@ -4,6 +4,8 @@
 2.12.0 - unreleased
 -------------------
 
+- Require at least ZODB 3.9 and adjusted method signatures to disuse versions.
+
 - Expanded dependency on ZODB3 to include the test extra.
 
 2.11.3 - 2010-06-05

Modified: tempstorage/trunk/setup.py
===================================================================
--- tempstorage/trunk/setup.py	2010-09-25 13:20:53 UTC (rev 116904)
+++ tempstorage/trunk/setup.py	2010-09-25 13:21:09 UTC (rev 116905)
@@ -30,7 +30,7 @@
       packages=find_packages('src'),
       package_dir={'': 'src'},
       install_requires=[
-        'ZODB3 [test]',
+        'ZODB3 [test] >= 3.9.0',
       ],
       include_package_data=True,
       zip_safe=False,

Modified: tempstorage/trunk/src/tempstorage/TemporaryStorage.py
===================================================================
--- tempstorage/trunk/src/tempstorage/TemporaryStorage.py	2010-09-25 13:20:53 UTC (rev 116904)
+++ tempstorage/trunk/src/tempstorage/TemporaryStorage.py	2010-09-25 13:21:09 UTC (rev 116905)
@@ -127,7 +127,7 @@
         """ Close the storage
         """
 
-    def load(self, oid, version):
+    def load(self, oid, version=''):
         self._lock_acquire()
         try:
             try:
@@ -158,11 +158,9 @@
     # cache".  But 'load' appears to do that too, so uh, who knows.
     # - CM
 
-    def loadEx(self, oid, version):
-        data = self.load(oid, version)
+    def loadEx(self, oid, version=''):
+        data = self.load(oid)
         # pickle, serial, version
-        # return an empty string for the version, as this is not a
-        # versioning storage, and it's what MappingStorage does.
         return (data[0], data[1], "")
 
     def loadSerial(self, oid, serial, marker=[]):
@@ -212,11 +210,7 @@
     def store(self, oid, serial, data, version, transaction):
         if transaction is not self._transaction:
             raise POSException.StorageTransactionError(self, transaction)
-        if version:
-            # we allow a version to be in use although we don't
-            # support versions in the storage.
-            LOG.debug('versions in use with TemporaryStorage although'
-                      'Temporary Storage doesnt support versions')
+        assert not version
 
         self._lock_acquire()
         try: