[Zodb-checkins] SVN: ZODB/branches/jim-zeo-blob/src/ZODB/ Removed version argument from calls to loadBlob.

[Jim Fulton]

Log message for revision 75818:
  Removed version argument from calls to loadBlob.
  

Changed:
  U   ZODB/branches/jim-zeo-blob/src/ZODB/Connection.py
  U   ZODB/branches/jim-zeo-blob/src/ZODB/ExportImport.py

-=-
Modified: ZODB/branches/jim-zeo-blob/src/ZODB/Connection.py
===================================================================
--- ZODB/branches/jim-zeo-blob/src/ZODB/Connection.py	2007-05-17 19:23:40 UTC (rev 75817)
+++ ZODB/branches/jim-zeo-blob/src/ZODB/Connection.py	2007-05-17 20:39:31 UTC (rev 75818)
@@ -853,8 +853,7 @@
         providedBy = getattr(obj, '__providedBy__', None)
         if providedBy is not None and IBlob in providedBy:
             obj._p_blob_uncommitted = None
-            obj._p_blob_data = self._storage.loadBlob(
-                obj._p_oid, serial, self._version)
+            obj._p_blob_data = self._storage.loadBlob(obj._p_oid, serial)
 
     def _load_before_or_conflict(self, obj):
         """Load non-current state for obj or raise ReadConflictError."""
@@ -1108,7 +1107,7 @@
         for oid in oids:
             data, serial = src.load(oid, src)
             try:
-                blobfilename = src.loadBlob(oid, serial, self._version)
+                blobfilename = src.loadBlob(oid, serial)
             except POSKeyError:
                 s = self._storage.store(oid, serial, data,
                                         self._version, transaction)
@@ -1250,7 +1249,7 @@
         targetname = self._getCleanFilename(oid, serial)
         os.rename(blobfilename, targetname)
 
-    def loadBlob(self, oid, serial, version):
+    def loadBlob(self, oid, serial):
         """Return the filename where the blob file can be found.
         """
         filename = self._getCleanFilename(oid, serial)

Modified: ZODB/branches/jim-zeo-blob/src/ZODB/ExportImport.py
===================================================================
--- ZODB/branches/jim-zeo-blob/src/ZODB/ExportImport.py	2007-05-17 19:23:40 UTC (rev 75817)
+++ ZODB/branches/jim-zeo-blob/src/ZODB/ExportImport.py	2007-05-17 20:39:31 UTC (rev 75818)
@@ -58,8 +58,7 @@
                 if 'Blob' not in p:
                     continue # filter out most non-blobs
                 
-                blobfilename = self._storage.loadBlob(
-                    oid, serial, self._version)
+                blobfilename = self._storage.loadBlob(oid, serial)
                 if blobfilename is None:
                     # This could be a non-blob or a blob with unsaved data.
                     continue