[CalendarServer-changes] [13156] CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py

source_changes at macosforge.org source_changes at macosforge.org
Fri Apr 4 10:05:03 PDT 2014


Revision: 13156
          http://trac.calendarserver.org//changeset/13156
Author:   sagen at apple.com
Date:     2014-04-04 10:05:03 -0700 (Fri, 04 Apr 2014)
Log Message:
-----------
Cleanup

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py

Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py
===================================================================
--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py	2014-04-04 16:32:37 UTC (rev 13155)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/augment.py	2014-04-04 17:05:03 UTC (rev 13156)
@@ -64,12 +64,6 @@
     ))
 
 
-    @property
-    def recordType(self):
-        # Defer to the directory service we're augmenting
-        return self._directory.recordType
-
-
     def __init__(self, directory, store, augmentDB):
         BaseDirectoryService.__init__(self, directory.realmName)
         self._directory = directory
@@ -77,6 +71,12 @@
         self._augmentDB = augmentDB
 
 
+    @property
+    def recordType(self):
+        # Defer to the directory service we're augmenting
+        return self._directory.recordType
+
+
     def recordTypes(self):
         # Defer to the directory service we're augmenting
         return self._directory.recordTypes()
@@ -135,11 +135,6 @@
 
     @inlineCallbacks
     def recordWithShortName(self, recordType, shortName):
-        # log.debug(
-        #     "Augment - recordWithShortName {rt}, {n}",
-        #     rt=recordType.name,
-        #     n=shortName
-        # )
         # MOVE2WHO, REMOVE THIS:
         if not isinstance(shortName, unicode):
             # log.warn("Need to change shortName to unicode")
@@ -149,13 +144,6 @@
             recordType, shortName
         )
         record = yield self._augment(record)
-        # log.debug(
-        #     "Augment - recordWithShortName {rt}, {n} returned {r}, {u}",
-        #     rt=recordType.name,
-        #     n=shortName,
-        #     r=record.recordType.name,
-        #     u=record.uid
-        # )
         returnValue(record)
 
 
@@ -357,11 +345,6 @@
                     )
 
         else:
-            # Groups are by default always enabled
-            # record.enabled = (
-            #     record.recordType == record.service.recordType_groups
-            # )
-            # record.serverID = ""
             self._assignToField(fields, "hasCalendars", False)
             self._assignToField(fields, "hasContacts", False)
             self._assignToField(fields, "loginAllowed", False)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140404/b15a4bd3/attachment.html>


More information about the calendarserver-changes mailing list