[Zodb-checkins] SVN: ZODB/branches/blob-merge-branch/src/Z - removed use of the word "DIRTY" for BlobStorage

[Christian Theune]

Log message for revision 65514:
   - removed use of the word "DIRTY" for BlobStorage
   - replaced "DIRTY" with "LOADING" for ClientStorage
  

Changed:
  U   ZODB/branches/blob-merge-branch/src/ZEO/ClientStorage.py
  U   ZODB/branches/blob-merge-branch/src/ZODB/Blobs/BlobStorage.py

-=-
Modified: ZODB/branches/blob-merge-branch/src/ZEO/ClientStorage.py
===================================================================
--- ZODB/branches/blob-merge-branch/src/ZEO/ClientStorage.py	2006-02-27 05:56:40 UTC (rev 65513)
+++ ZODB/branches/blob-merge-branch/src/ZEO/ClientStorage.py	2006-02-27 05:59:13 UTC (rev 65514)
@@ -35,7 +35,7 @@
 from ZEO.auth import get_module
 from ZEO.zrpc.client import ConnectionManager
 
-from ZODB.Blobs.BlobStorage import BLOB_SUFFIX, BLOB_DIRTY
+from ZODB.Blobs.BlobStorage import BLOB_SUFFIX 
 from ZODB import POSException
 from ZODB import utils
 from ZODB.loglevels import BLATHER
@@ -928,10 +928,10 @@
                             utils.oid_repr(oid)
                             )
 
-    def _getDirtyFilename(self, oid, serial):
+    def _getLoadingFilename(self, oid, serial):
         """Generate an intermediate filename for two-phase commit.
         """
-        return self._getCleanFilename(oid, serial) + "." + BLOB_DIRTY
+        return self._getCleanFilename(oid, serial) + ".loading" 
 
     def _getCleanFilename(self, oid, tid):
         return os.path.join(self._getBlobPath(oid),
@@ -951,7 +951,7 @@
 
         # We write to a temporary file first, so we do not accidentally 
         # allow half-baked copies of this blob be loaded
-        tempfilename = self._getDirtyFilename(oid, serial)
+        tempfilename = self._getLoadingFilename(oid, serial)
         tempfile = open(tempfilename, "wb")
         
         offset = 0

Modified: ZODB/branches/blob-merge-branch/src/ZODB/Blobs/BlobStorage.py
===================================================================
--- ZODB/branches/blob-merge-branch/src/ZODB/Blobs/BlobStorage.py	2006-02-27 05:56:40 UTC (rev 65513)
+++ ZODB/branches/blob-merge-branch/src/ZODB/Blobs/BlobStorage.py	2006-02-27 05:59:13 UTC (rev 65514)
@@ -24,7 +24,6 @@
 from ZODB.POSException import POSKeyError
 
 BLOB_SUFFIX = ".blob"
-BLOB_DIRTY = "store"
 
 class BlobStorage(ProxyBase):
     """A storage to support blobs."""
@@ -209,10 +208,7 @@
 
         serial = filename[:-len(BLOB_SUFFIX)]
         oid = utils.repr_to_oid(oid)
-        if serial != BLOB_DIRTY:
-            serial = utils.repr_to_oid(serial)
-        else:
-            serial = None
+        serial = utils.repr_to_oid(serial)
         return oid, serial 
 
     def undo(self, serial_id, transaction):