<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13801] CalendarServer/trunk/txdav/base</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/13801">13801</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-07-29 07:59:53 -0700 (Tue, 29 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>White space.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavbasedatastorefilepy">CalendarServer/trunk/txdav/base/datastore/file.py</a></li>
<li><a href="#CalendarServertrunktxdavbasepropertystoreappledouble_xattrpy">CalendarServer/trunk/txdav/base/propertystore/appledouble_xattr.py</a></li>
<li><a href="#CalendarServertrunktxdavbasepropertystoresqlpy">CalendarServer/trunk/txdav/base/propertystore/sql.py</a></li>
<li><a href="#CalendarServertrunktxdavbasepropertystoretesttest_sqlpy">CalendarServer/trunk/txdav/base/propertystore/test/test_sql.py</a></li>
<li><a href="#CalendarServertrunktxdavbasepropertystorexattrpy">CalendarServer/trunk/txdav/base/propertystore/xattr.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavbasedatastorefilepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/file.py (13800 => 13801)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -77,9 +77,9 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         self._path = path
</span><span class="cx"> 
</span><del>-#        if not path.isdir():
-            # FIXME: Add DataStoreNotFoundError?
-#            raise NotFoundError(&quot;No such data store&quot;)
</del><ins>+        # if not path.isdir():
+        # FIXME: Add DataStoreNotFoundError?
+        #     raise NotFoundError(&quot;No such data store&quot;)
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def __repr__(self):
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasepropertystoreappledouble_xattrpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/propertystore/appledouble_xattr.py (13800 => 13801)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -113,9 +113,8 @@
</span><span class="cx">                 raise ValueError(&quot;Short read: expected %d bytes got %d&quot; %
</span><span class="cx">                                  (length - XATTR_OFFSET, len(data)))
</span><span class="cx">             magic, _ignore_tag, total_size, data_start, data_length, \
</span><del>-            _ignore_reserved1, _ignore_reserved2, _ignore_reserved3, \
-            flags, num_attrs = struct.unpack(XATTR_HEADER,
-                                             data[:XATTR_HEADER_LENGTH])
</del><ins>+                _ignore_reserved1, _ignore_reserved2, _ignore_reserved3, \
+                flags, num_attrs = struct.unpack(XATTR_HEADER, data[:XATTR_HEADER_LENGTH])
</ins><span class="cx">             if magic != XATTR_HDR_MAGIC:
</span><span class="cx">                 raise ValueError(&quot;No xattrs found&quot;)
</span><span class="cx"> 
</span><span class="lines">@@ -131,14 +130,13 @@
</span><span class="cx">             # Get each xattr entry
</span><span class="cx">             data = data[XATTR_HEADER_LENGTH:]
</span><span class="cx">             for _ignore in xrange(num_attrs):
</span><del>-                [xattr_offset, xattr_length,
-                 xattr_flags, xattr_name_len] = struct.unpack(
-                     XATTR_ENTRY, data[:XATTR_ENTRY_LENGTH]
-                 )
</del><ins>+                [
+                    xattr_offset, xattr_length,
+                    xattr_flags, xattr_name_len
+                ] = struct.unpack(XATTR_ENTRY, data[:XATTR_ENTRY_LENGTH])
</ins><span class="cx">                 xattr_name = data[
</span><span class="cx">                     XATTR_ENTRY_LENGTH:
</span><del>-                    XATTR_ENTRY_LENGTH + xattr_name_len
-                    - 1 # strip NULL terminator
</del><ins>+                    XATTR_ENTRY_LENGTH + xattr_name_len - 1 # strip NULL terminator
</ins><span class="cx">                 ]
</span><span class="cx">                 fileobj.seek(xattr_offset)
</span><span class="cx">                 xattr_value = fileobj.read(xattr_length)
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasepropertystoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/propertystore/sql.py (13800 => 13801)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -339,10 +339,11 @@
</span><span class="cx">         del self._cached[(key_str, uid)]
</span><span class="cx">         @inlineCallbacks
</span><span class="cx">         def doIt(txn):
</span><del>-            yield self._deleteQuery.on(txn, lambda: KeyError(key),
-                                 resourceID=self._resourceID,
-                                 name=key_str, uid=uid
-                                )
</del><ins>+            yield self._deleteQuery.on(
+                txn, lambda: KeyError(key),
+                resourceID=self._resourceID,
+                name=key_str, uid=uid
+            )
</ins><span class="cx">             if self._cacher is not None:
</span><span class="cx">                 self._cacher.delete(self._cacheToken(uid))
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasepropertystoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/propertystore/test/test_sql.py (13800 => 13801)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">         self.addCleanup(self.maybeCommitLast)
</span><span class="cx">         self._txn = self.store.newTransaction()
</span><span class="cx">         self.propertyStore = \
</span><del>-        self.propertyStore1 = yield PropertyStore.load(&quot;user01&quot;, None, None, self._txn, 1)
</del><ins>+            self.propertyStore1 = yield PropertyStore.load(&quot;user01&quot;, None, None, self._txn, 1)
</ins><span class="cx">         self.propertyStore2 = yield PropertyStore.load(&quot;user01&quot;, &quot;user02&quot;, None, self._txn, 1)
</span><span class="cx">         self.propertyStore3 = yield PropertyStore.load(&quot;user01&quot;, None, &quot;user03&quot;, self._txn, 1)
</span><span class="cx">         self.propertyStore4 = yield PropertyStore.load(&quot;user01&quot;, &quot;user02&quot;, &quot;user04&quot;, self._txn, 1)
</span><span class="lines">@@ -64,10 +64,10 @@
</span><span class="cx">         else:
</span><span class="cx">             result = None
</span><span class="cx">         self.propertyStore = \
</span><del>-        self.propertyStore1 = \
-        self.propertyStore2 = \
-        self.propertyStore3 = \
-        self.propertyStore4 = None
</del><ins>+            self.propertyStore1 = \
+            self.propertyStore2 = \
+            self.propertyStore3 = \
+            self.propertyStore4 = None
</ins><span class="cx">         returnValue(result)
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> 
</span><span class="cx">         store = self.propertyStore1
</span><span class="cx">         self.propertyStore = \
</span><del>-        self.propertyStore1 = yield PropertyStore.load(&quot;user01&quot;, None, None, self._txn, 1)
</del><ins>+            self.propertyStore1 = yield PropertyStore.load(&quot;user01&quot;, None, None, self._txn, 1)
</ins><span class="cx">         self.propertyStore1._shadowableKeys = store._shadowableKeys
</span><span class="cx">         self.propertyStore1._proxyOverrideKeys = store._proxyOverrideKeys
</span><span class="cx">         self.propertyStore1._globalKeys = store._globalKeys
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> 
</span><span class="cx">         store = self.propertyStore1
</span><span class="cx">         self.propertyStore = \
</span><del>-        self.propertyStore1 = yield PropertyStore.load(&quot;user01&quot;, None, None, self._txn, 1)
</del><ins>+            self.propertyStore1 = yield PropertyStore.load(&quot;user01&quot;, None, None, self._txn, 1)
</ins><span class="cx">         self.propertyStore1._shadowableKeys = store._shadowableKeys
</span><span class="cx">         self.propertyStore1._proxyOverrideKeys = store._proxyOverrideKeys
</span><span class="cx">         self.propertyStore1._globalKeys = store._globalKeys
</span></span></pre></div>
<a id="CalendarServertrunktxdavbasepropertystorexattrpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/propertystore/xattr.py (13800 => 13801)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> from txdav.xml.base import encodeXMLName
</span><span class="cx"> from txdav.xml.parser import WebDAVDocument
</span><span class="cx"> from txdav.base.propertystore.base import AbstractPropertyStore, PropertyName, \
</span><del>-        validKey
</del><ins>+    validKey
</ins><span class="cx"> from txdav.idav import PropertyStoreError
</span><span class="cx"> 
</span><span class="cx"> #
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx">                 raise PropertyStoreError(e)
</span><span class="cx">         except KeyError:
</span><span class="cx">             # Check for uncompressed namespace
</span><del>-            if  effectiveKey[0].namespace in self._namespaceCompress:
</del><ins>+            if effectiveKey[0].namespace in self._namespaceCompress:
</ins><span class="cx">                 try:
</span><span class="cx">                     data = self.attrs[self._encodeKey(effectiveKey,
</span><span class="cx">                                                       compressNamespace=False)]
</span></span></pre>
</div>
</div>

</body>
</html>