Commit 33019f0c authored by Jim Fulton's avatar Jim Fulton

Cleaned up trailing whitespace.

parent 4e2afee7
...@@ -128,7 +128,7 @@ class Blob(persistent.Persistent): ...@@ -128,7 +128,7 @@ class Blob(persistent.Persistent):
or or
self._p_blob_committed.endswith(SAVEPOINT_SUFFIX) self._p_blob_committed.endswith(SAVEPOINT_SUFFIX)
): ):
raise BlobError('Uncommitted changes') raise BlobError('Uncommitted changes')
return self._p_jar._storage.openCommittedBlobFile( return self._p_jar._storage.openCommittedBlobFile(
self._p_oid, self._p_serial) self._p_oid, self._p_serial)
...@@ -203,7 +203,7 @@ class Blob(persistent.Persistent): ...@@ -203,7 +203,7 @@ class Blob(persistent.Persistent):
raise BlobError('Uncommitted changes') raise BlobError('Uncommitted changes')
result = self._p_blob_committed result = self._p_blob_committed
# We do this to make sure we have the file and to let the # We do this to make sure we have the file and to let the
# storage know we're accessing the file. # storage know we're accessing the file.
n = self._p_jar._storage.loadBlob(self._p_oid, self._p_serial) n = self._p_jar._storage.loadBlob(self._p_oid, self._p_serial)
...@@ -252,7 +252,7 @@ class Blob(persistent.Persistent): ...@@ -252,7 +252,7 @@ class Blob(persistent.Persistent):
raise raise
else: else:
if previous_uncommitted: if previous_uncommitted:
# The relinking worked so we can remove the data that we had # The relinking worked so we can remove the data that we had
# set aside. # set aside.
os.remove(target_aside) os.remove(target_aside)
...@@ -333,7 +333,7 @@ class FilesystemHelper: ...@@ -333,7 +333,7 @@ class FilesystemHelper:
log('The `lawn` blob directory layout is deprecated due to ' log('The `lawn` blob directory layout is deprecated due to '
'scalability issues on some file systems, please consider ' 'scalability issues on some file systems, please consider '
'migrating to the `bushy` layout.', level=logging.WARN) 'migrating to the `bushy` layout.', level=logging.WARN)
self.layout_name = layout_name self.layout_name = layout_name
self.layout = LAYOUTS[layout_name] self.layout = LAYOUTS[layout_name]
def create(self): def create(self):
...@@ -454,7 +454,7 @@ class FilesystemHelper: ...@@ -454,7 +454,7 @@ class FilesystemHelper:
serial = filename[:-len(BLOB_SUFFIX)] serial = filename[:-len(BLOB_SUFFIX)]
serial = utils.repr_to_oid(serial) serial = utils.repr_to_oid(serial)
return oid, serial return oid, serial
def getOIDsForSerial(self, search_serial): def getOIDsForSerial(self, search_serial):
"""Return all oids related to a particular tid that exist in """Return all oids related to a particular tid that exist in
...@@ -671,7 +671,7 @@ class BlobStorageMixin(object): ...@@ -671,7 +671,7 @@ class BlobStorageMixin(object):
self.dirty_oids.append((oid, serial)) self.dirty_oids.append((oid, serial))
finally: finally:
self._lock_release() self._lock_release()
def storeBlob(self, oid, oldserial, data, blobfilename, version, def storeBlob(self, oid, oldserial, data, blobfilename, version,
transaction): transaction):
"""Stores data that has a BLOB attached.""" """Stores data that has a BLOB attached."""
...@@ -725,7 +725,7 @@ class BlobStorage(SpecificationDecoratorBase): ...@@ -725,7 +725,7 @@ class BlobStorage(SpecificationDecoratorBase):
@non_overridable @non_overridable
def tpc_finish(self, *arg, **kw): def tpc_finish(self, *arg, **kw):
# We need to override the base storage's tpc_finish instead of # We need to override the base storage's tpc_finish instead of
# providing a _finish method because methods found on the proxied # providing a _finish method because methods found on the proxied
# object aren't rebound to the proxy # object aren't rebound to the proxy
getProxiedObject(self).tpc_finish(*arg, **kw) getProxiedObject(self).tpc_finish(*arg, **kw)
self._blob_tpc_finish() self._blob_tpc_finish()
...@@ -919,7 +919,7 @@ def is_blob_record(record): ...@@ -919,7 +919,7 @@ def is_blob_record(record):
This is primarily intended to be used when copying data from one This is primarily intended to be used when copying data from one
storage to another. storage to another.
""" """
try: try:
return cPickle.loads(record) is ZODB.blob.Blob return cPickle.loads(record) is ZODB.blob.Blob
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment