[CalendarServer-changes] [13150] CalendarServer/branches/users/sagen/move2who-4

[source_changes at macosforge.org]

Revision: 13150
          http://trac.calendarserver.org//changeset/13150
Author:   sagen at apple.com
Date:     2014-04-03 16:47:59 -0700 (Thu, 03 Apr 2014)
Log Message:
-----------
Remove obsolete things

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py
    CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/test/test_sharing.py
    CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py

Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py	2014-04-03 23:44:05 UTC (rev 13149)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py	2014-04-03 23:47:59 UTC (rev 13150)
@@ -533,11 +533,9 @@
 
 
     def principalForRecord(self, record):
-        # MOVE2WHO
-        if record is None: #  or not record.enabled:
+        if record is None:
             return succeed(None)
 
-        # MOVE2WHO
         if record.hasCalendars or record.hasContacts:
             # XXX these are different features and one should not automatically
             # imply the other...

Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/test/test_sharing.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/test/test_sharing.py	2014-04-03 23:44:05 UTC (rev 13149)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/test/test_sharing.py	2014-04-03 23:47:59 UTC (rev 13150)
@@ -738,7 +738,6 @@
         self.assertEquals(propInvite, None)
 
 
-    # MOVE2WHO Fix wiki
     @inlineCallbacks
     def wikiSetup(self):
         """
@@ -747,7 +746,6 @@
         sharee's home.
         """
 
-        # self._sqlCalendarStore._directoryService = buildDirectory(homes=("wiki-testing",))
         wcreate = self._sqlCalendarStore.newTransaction("create wiki")
         yield wcreate.calendarHomeWithUID(
             u"{prefix}testing".format(prefix=WikiDirectoryService.uidPrefix),

Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py	2014-04-03 23:44:05 UTC (rev 13149)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py	2014-04-03 23:47:59 UTC (rev 13150)
@@ -25,7 +25,7 @@
 import twext.who.idirectory
 from twext.who.util import ConstantsContainer
 from twisted.internet import reactor
-from twisted.internet.defer import inlineCallbacks, returnValue, succeed
+from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.internet.protocol import ClientCreator
 from twisted.protocols import amp
 from twisted.python.constants import Names, NamedConstant
@@ -89,13 +89,6 @@
     )
 
 
-    # MOVE2WHO needed?
-    def getGroups(self, guids=None):
-        return succeed(set())
-    # END MOVE2WHO
-
-
-
     def _dictToRecord(self, serializedFields):
         """
         Turn a dictionary of fields sent from the server into a directory
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140403/535ba637/attachment.html>