[CalendarServer-changes] [13917] CalendarServer/trunk/txdav
source_changes at macosforge.org
source_changes at macosforge.org
Mon Aug 25 10:39:41 PDT 2014
Revision: 13917
http://trac.calendarserver.org//changeset/13917
Author: cdaboo at apple.com
Date: 2014-08-25 10:39:41 -0700 (Mon, 25 Aug 2014)
Log Message:
-----------
Whitespace.
Modified Paths:
--------------
CalendarServer/trunk/txdav/dps/client.py
CalendarServer/trunk/txdav/dps/commands.py
CalendarServer/trunk/txdav/dps/json.py
CalendarServer/trunk/txdav/dps/server.py
CalendarServer/trunk/txdav/who/augment.py
CalendarServer/trunk/txdav/who/groups.py
CalendarServer/trunk/txdav/who/idirectory.py
CalendarServer/trunk/txdav/who/test/test_cache.py
Modified: CalendarServer/trunk/txdav/dps/client.py
===================================================================
--- CalendarServer/trunk/txdav/dps/client.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/dps/client.py 2014-08-25 17:39:41 UTC (rev 13917)
@@ -345,7 +345,6 @@
)
-
def recordsFromExpression(self, expression, recordTypes=None):
raise NotImplementedError(
"This won't work until expressions are serializable to send "
Modified: CalendarServer/trunk/txdav/dps/commands.py
===================================================================
--- CalendarServer/trunk/txdav/dps/commands.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/dps/commands.py 2014-08-25 17:39:41 UTC (rev 13917)
@@ -159,6 +159,7 @@
]
+
class ExpandedMemberUIDsCommand(amp.Command):
arguments = [
('uid', amp.String()),
@@ -211,6 +212,7 @@
]
+
class ExternalDelegatesCommand(amp.Command):
arguments = []
response = [
@@ -219,6 +221,7 @@
]
+
class StatsCommand(amp.Command):
arguments = []
response = [
Modified: CalendarServer/trunk/txdav/dps/json.py
===================================================================
--- CalendarServer/trunk/txdav/dps/json.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/dps/json.py 2014-08-25 17:39:41 UTC (rev 13917)
@@ -47,6 +47,7 @@
)
+
def existsExpressionAsJSON(expression):
return dict(
type=expression.__class__.__name__,
@@ -54,6 +55,7 @@
)
+
def booleanExpressionAsJSON(expression):
return dict(
type=expression.__class__.__name__,
@@ -137,6 +139,7 @@
)
+
def existsExpressionFromJSON(service, json):
try:
jsonField = json["field"]
@@ -150,6 +153,7 @@
return ExistsExpression(fieldName)
+
def booleanExpressionFromJSON(service, json):
try:
jsonField = json["field"]
@@ -163,6 +167,7 @@
return BooleanExpression(fieldName)
+
def compoundExpressionFromJSON(json):
try:
expressions_json = json["expressions"]
Modified: CalendarServer/trunk/txdav/dps/server.py
===================================================================
--- CalendarServer/trunk/txdav/dps/server.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/dps/server.py 2014-08-25 17:39:41 UTC (rev 13917)
@@ -208,8 +208,6 @@
return response
-
-
def recordToDict(self, record):
"""
Turn a record in a dictionary of fields which can be reconstituted
Modified: CalendarServer/trunk/txdav/who/augment.py
===================================================================
--- CalendarServer/trunk/txdav/who/augment.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/who/augment.py 2014-08-25 17:39:41 UTC (rev 13917)
@@ -131,7 +131,7 @@
def stats(self):
results = {}
results.update(self._timings)
-
+
# An LDAP DS has extra info to expose via the dashboard
if self._ldapDS is not None:
results.update(self._ldapDS.poolStats)
Modified: CalendarServer/trunk/txdav/who/groups.py
===================================================================
--- CalendarServer/trunk/txdav/who/groups.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/who/groups.py 2014-08-25 17:39:41 UTC (rev 13917)
@@ -148,6 +148,7 @@
)
+
class GroupAttendeeReconciliationWork(
WorkItem, fromTable(schema.GROUP_ATTENDEE_RECONCILE_WORK)
):
Modified: CalendarServer/trunk/txdav/who/idirectory.py
===================================================================
--- CalendarServer/trunk/txdav/who/idirectory.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/who/idirectory.py 2014-08-25 17:39:41 UTC (rev 13917)
@@ -164,8 +164,6 @@
readWriteProxy.description = u"read-write proxy group"
readWriteProxy.valueType = BaseFieldName.valueType(BaseFieldName.uid)
-
-
# For "locations", i.e., scheduled spaces:
associatedAddress = NamedConstant()
Modified: CalendarServer/trunk/txdav/who/test/test_cache.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_cache.py 2014-08-25 16:34:31 UTC (rev 13916)
+++ CalendarServer/trunk/txdav/who/test/test_cache.py 2014-08-25 17:39:41 UTC (rev 13917)
@@ -45,7 +45,6 @@
self.storeUnderTest().setDirectoryService(self.cachingDirectory)
-
@inlineCallbacks
def test_cachingPassThrough(self):
"""
@@ -76,7 +75,6 @@
self.assertEquals(record.uid, u"cache-uid-2")
-
@inlineCallbacks
def test_cachingHitsAndMisses(self):
"""
@@ -255,7 +253,7 @@
# After SCAN_AFTER_LOOKUP_COUNT requests, however, that expired entry
# will be removed
- for i in xrange(SCAN_AFTER_LOOKUP_COUNT):
+ for _ignore_i in xrange(SCAN_AFTER_LOOKUP_COUNT):
yield dir.recordWithUID(u"cache-uid-2")
# cache-uid-1 no longer in cache
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140825/d516ff5b/attachment.html>
More information about the calendarserver-changes
mailing list