[CalendarServer-changes] [13693] CalendarServer/trunk/txdav

[source_changes at macosforge.org]

Revision: 13693
          http://trac.calendarserver.org//changeset/13693
Author:   cdaboo at apple.com
Date:     2014-06-25 18:35:18 -0700 (Wed, 25 Jun 2014)
Log Message:
-----------
Code clean.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/dps/server.py
    CalendarServer/trunk/txdav/who/directory.py
    CalendarServer/trunk/txdav/who/opendirectory.py

Modified: CalendarServer/trunk/txdav/dps/server.py
===================================================================
--- CalendarServer/trunk/txdav/dps/server.py	2014-06-26 01:27:54 UTC (rev 13692)
+++ CalendarServer/trunk/txdav/dps/server.py	2014-06-26 01:35:18 UTC (rev 13693)
@@ -100,7 +100,7 @@
         @return: an iterable of records, or None if the token does not exist
         """
         if token in self._continuations:
-            timestamp, records = self._continuations[token]
+            _ignore_timestamp, records = self._continuations[token]
             del self._continuations[token]
         else:
             records = None

Modified: CalendarServer/trunk/txdav/who/directory.py
===================================================================
--- CalendarServer/trunk/txdav/who/directory.py	2014-06-26 01:27:54 UTC (rev 13692)
+++ CalendarServer/trunk/txdav/who/directory.py	2014-06-26 01:35:18 UTC (rev 13693)
@@ -175,8 +175,6 @@
         else:
             expression = CompoundExpression(outer, Operand.AND)
 
-        results = []
-
         if context is not None:
             recordTypes = self.recordTypesForSearchContext(context)
         else:

Modified: CalendarServer/trunk/txdav/who/opendirectory.py
===================================================================
--- CalendarServer/trunk/txdav/who/opendirectory.py	2014-06-26 01:27:54 UTC (rev 13692)
+++ CalendarServer/trunk/txdav/who/opendirectory.py	2014-06-26 01:35:18 UTC (rev 13693)
@@ -28,6 +28,7 @@
 
 from twext.who.opendirectory import DirectoryService
 
+DirectoryService    # Something has to use the import
 
 # Hoorj OMG haxx
 from twext.who.opendirectory._constants import ODRecordType as _ODRecordType
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140625/9fe3ab9b/attachment.html>