[CalendarServer-changes] [13801] CalendarServer/trunk/txdav/base
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jul 29 07:59:53 PDT 2014
Revision: 13801
http://trac.calendarserver.org//changeset/13801
Author: cdaboo at apple.com
Date: 2014-07-29 07:59:53 -0700 (Tue, 29 Jul 2014)
Log Message:
-----------
White space.
Modified Paths:
--------------
CalendarServer/trunk/txdav/base/datastore/file.py
CalendarServer/trunk/txdav/base/propertystore/appledouble_xattr.py
CalendarServer/trunk/txdav/base/propertystore/sql.py
CalendarServer/trunk/txdav/base/propertystore/test/test_sql.py
CalendarServer/trunk/txdav/base/propertystore/xattr.py
Modified: CalendarServer/trunk/txdav/base/datastore/file.py
===================================================================
--- CalendarServer/trunk/txdav/base/datastore/file.py 2014-07-29 14:53:07 UTC (rev 13800)
+++ CalendarServer/trunk/txdav/base/datastore/file.py 2014-07-29 14:59:53 UTC (rev 13801)
@@ -77,9 +77,9 @@
"""
self._path = path
-# if not path.isdir():
- # FIXME: Add DataStoreNotFoundError?
-# raise NotFoundError("No such data store")
+ # if not path.isdir():
+ # FIXME: Add DataStoreNotFoundError?
+ # raise NotFoundError("No such data store")
def __repr__(self):
Modified: CalendarServer/trunk/txdav/base/propertystore/appledouble_xattr.py
===================================================================
--- CalendarServer/trunk/txdav/base/propertystore/appledouble_xattr.py 2014-07-29 14:53:07 UTC (rev 13800)
+++ CalendarServer/trunk/txdav/base/propertystore/appledouble_xattr.py 2014-07-29 14:59:53 UTC (rev 13801)
@@ -113,9 +113,8 @@
raise ValueError("Short read: expected %d bytes got %d" %
(length - XATTR_OFFSET, len(data)))
magic, _ignore_tag, total_size, data_start, data_length, \
- _ignore_reserved1, _ignore_reserved2, _ignore_reserved3, \
- flags, num_attrs = struct.unpack(XATTR_HEADER,
- data[:XATTR_HEADER_LENGTH])
+ _ignore_reserved1, _ignore_reserved2, _ignore_reserved3, \
+ flags, num_attrs = struct.unpack(XATTR_HEADER, data[:XATTR_HEADER_LENGTH])
if magic != XATTR_HDR_MAGIC:
raise ValueError("No xattrs found")
@@ -131,14 +130,13 @@
# Get each xattr entry
data = data[XATTR_HEADER_LENGTH:]
for _ignore in xrange(num_attrs):
- [xattr_offset, xattr_length,
- xattr_flags, xattr_name_len] = struct.unpack(
- XATTR_ENTRY, data[:XATTR_ENTRY_LENGTH]
- )
+ [
+ xattr_offset, xattr_length,
+ xattr_flags, xattr_name_len
+ ] = struct.unpack(XATTR_ENTRY, data[:XATTR_ENTRY_LENGTH])
xattr_name = data[
XATTR_ENTRY_LENGTH:
- XATTR_ENTRY_LENGTH + xattr_name_len
- - 1 # strip NULL terminator
+ XATTR_ENTRY_LENGTH + xattr_name_len - 1 # strip NULL terminator
]
fileobj.seek(xattr_offset)
xattr_value = fileobj.read(xattr_length)
Modified: CalendarServer/trunk/txdav/base/propertystore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/base/propertystore/sql.py 2014-07-29 14:53:07 UTC (rev 13800)
+++ CalendarServer/trunk/txdav/base/propertystore/sql.py 2014-07-29 14:59:53 UTC (rev 13801)
@@ -339,10 +339,11 @@
del self._cached[(key_str, uid)]
@inlineCallbacks
def doIt(txn):
- yield self._deleteQuery.on(txn, lambda: KeyError(key),
- resourceID=self._resourceID,
- name=key_str, uid=uid
- )
+ yield self._deleteQuery.on(
+ txn, lambda: KeyError(key),
+ resourceID=self._resourceID,
+ name=key_str, uid=uid
+ )
if self._cacher is not None:
self._cacher.delete(self._cacheToken(uid))
Modified: CalendarServer/trunk/txdav/base/propertystore/test/test_sql.py
===================================================================
--- CalendarServer/trunk/txdav/base/propertystore/test/test_sql.py 2014-07-29 14:53:07 UTC (rev 13800)
+++ CalendarServer/trunk/txdav/base/propertystore/test/test_sql.py 2014-07-29 14:59:53 UTC (rev 13801)
@@ -50,7 +50,7 @@
self.addCleanup(self.maybeCommitLast)
self._txn = self.store.newTransaction()
self.propertyStore = \
- self.propertyStore1 = yield PropertyStore.load("user01", None, None, self._txn, 1)
+ self.propertyStore1 = yield PropertyStore.load("user01", None, None, self._txn, 1)
self.propertyStore2 = yield PropertyStore.load("user01", "user02", None, self._txn, 1)
self.propertyStore3 = yield PropertyStore.load("user01", None, "user03", self._txn, 1)
self.propertyStore4 = yield PropertyStore.load("user01", "user02", "user04", self._txn, 1)
@@ -64,10 +64,10 @@
else:
result = None
self.propertyStore = \
- self.propertyStore1 = \
- self.propertyStore2 = \
- self.propertyStore3 = \
- self.propertyStore4 = None
+ self.propertyStore1 = \
+ self.propertyStore2 = \
+ self.propertyStore3 = \
+ self.propertyStore4 = None
returnValue(result)
@@ -80,7 +80,7 @@
store = self.propertyStore1
self.propertyStore = \
- self.propertyStore1 = yield PropertyStore.load("user01", None, None, self._txn, 1)
+ self.propertyStore1 = yield PropertyStore.load("user01", None, None, self._txn, 1)
self.propertyStore1._shadowableKeys = store._shadowableKeys
self.propertyStore1._proxyOverrideKeys = store._proxyOverrideKeys
self.propertyStore1._globalKeys = store._globalKeys
@@ -114,7 +114,7 @@
store = self.propertyStore1
self.propertyStore = \
- self.propertyStore1 = yield PropertyStore.load("user01", None, None, self._txn, 1)
+ self.propertyStore1 = yield PropertyStore.load("user01", None, None, self._txn, 1)
self.propertyStore1._shadowableKeys = store._shadowableKeys
self.propertyStore1._proxyOverrideKeys = store._proxyOverrideKeys
self.propertyStore1._globalKeys = store._globalKeys
Modified: CalendarServer/trunk/txdav/base/propertystore/xattr.py
===================================================================
--- CalendarServer/trunk/txdav/base/propertystore/xattr.py 2014-07-29 14:53:07 UTC (rev 13800)
+++ CalendarServer/trunk/txdav/base/propertystore/xattr.py 2014-07-29 14:59:53 UTC (rev 13801)
@@ -37,7 +37,7 @@
from txdav.xml.base import encodeXMLName
from txdav.xml.parser import WebDAVDocument
from txdav.base.propertystore.base import AbstractPropertyStore, PropertyName, \
- validKey
+ validKey
from txdav.idav import PropertyStoreError
#
@@ -171,7 +171,7 @@
raise PropertyStoreError(e)
except KeyError:
# Check for uncompressed namespace
- if effectiveKey[0].namespace in self._namespaceCompress:
+ if effectiveKey[0].namespace in self._namespaceCompress:
try:
data = self.attrs[self._encodeKey(effectiveKey,
compressNamespace=False)]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140729/2b0ad7f1/attachment.html>
More information about the calendarserver-changes
mailing list