[CalendarServer-changes] [9111] CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav /directory

[source_changes at macosforge.org]

Revision: 9111
          http://trac.macosforge.org/projects/calendarserver/changeset/9111
Author:   gaya at apple.com
Date:     2012-04-13 16:40:51 -0700 (Fri, 13 Apr 2012)
Log Message:
-----------
cleaning

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py
    CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py
    CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py	2012-04-13 23:26:40 UTC (rev 9110)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py	2012-04-13 23:40:51 UTC (rev 9111)
@@ -25,7 +25,6 @@
 
 import traceback
 import ldap
-import sys
 
 from twisted.internet.defer import inlineCallbacks, returnValue, succeed
 
@@ -38,12 +37,7 @@
     """
     Directory backer for L{LdapDirectoryService}.
     """
-    
-    node="/Search"
 
-    def __repr__(self):
-        return "<%s %r>" % (self.__class__.__name__, self.realmName, )
-
     def __init__(self, params):
         self._actuallyConfigure(**params)
 
@@ -122,9 +116,6 @@
         self.directoryBackedAddressBook = directoryBackedAddressBook
         
         self.maxQueryResults = maxQueryResults
-
-                
-        self.realmName = None # needed for super        
         
         ### params for ABDirectoryQueryResult()
         self.fakeETag = fakeETag
@@ -133,12 +124,6 @@
         super(LdapDirectoryBackingService, self).__init__(params)
         
  
-    def __hash__(self):
-        h = hash(self.__class__.__name__)
-        for attr in ("node",):
-            h = (h + hash(getattr(self, attr))) & sys.maxint
-        return h
-    
     def createCache(self):
          succeed(None)
                         

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py	2012-04-13 23:26:40 UTC (rev 9110)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py	2012-04-13 23:40:51 UTC (rev 9111)
@@ -25,7 +25,6 @@
 
 import traceback
 import hashlib
-import sys
 import time
 from random import random
 
@@ -47,7 +46,7 @@
 
 from twistedcaldav import carddavxml
 from twistedcaldav.config import config
-from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
+from twistedcaldav.directory.directory import DirectoryService
 from twistedcaldav.query import addressbookqueryfilter
 from twistedcaldav.vcard import Component, Property, vCardProductID
 
@@ -142,8 +141,7 @@
         
         
         # calc realm name
-        realmName = "+".join(nodeDirectoryRecordTypeMap.keys())
-        self.realmName = realmName # needed for super
+        self.realmName = "+".join(nodeDirectoryRecordTypeMap.keys())
         
         self.queryPeopleRecords = queryPeopleRecords
         self.queryUserRecords = queryUserRecords
@@ -234,22 +232,7 @@
         self._dsLocalResults = {}
         self._nextDSLocalQueryTime = 0
         
-    def __cmp__(self, other):
-        if not isinstance(other, DirectoryRecord):
-            return super(DirectoryRecord, self).__eq__(other)
 
-        for attr in ("directory", "node"):
-            diff = cmp(getattr(self, attr), getattr(other, attr))
-            if diff != 0:
-                return diff
-        return 0
-
-    def __hash__(self):
-        h = hash(self.__class__.__name__)
-        for attr in ("node",):
-            h = (h + hash(getattr(self, attr))) & sys.maxint
-        return h
-    
     def createCache(self):
          succeed(None)
 

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py	2012-04-13 23:26:40 UTC (rev 9110)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py	2012-04-13 23:40:51 UTC (rev 9111)
@@ -37,10 +37,6 @@
     Directory backer for L{XMLDirectoryService}.
     """
     
-    node="/Search"
-    def __repr__(self):
-        return "<%s %r>" % (self.__class__.__name__, self.realmName, )
-
     def __init__(self, params):
         self._actuallyConfigure(**params)
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120413/34f6f5b3/attachment-0001.html>