[CalendarServer-changes] [8850] CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav /directory
source_changes at macosforge.org
source_changes at macosforge.org
Tue Mar 13 08:55:47 PDT 2012
Revision: 8850
http://trac.macosforge.org/projects/calendarserver/changeset/8850
Author: gaya at apple.com
Date: 2012-03-13 08:55:46 -0700 (Tue, 13 Mar 2012)
Log Message:
-----------
clean up imports
Modified Paths:
--------------
CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py
CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py
Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py 2012-03-13 15:44:23 UTC (rev 8849)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py 2012-03-13 15:55:46 UTC (rev 8850)
@@ -30,43 +30,16 @@
import sys
import time
-from os import listdir
-from os.path import join, abspath
-from tempfile import mkstemp, gettempdir
-from random import random
-
-from pycalendar.n import N
-from pycalendar.adr import Adr
-from pycalendar.datetime import PyCalendarDateTime
-
from socket import getfqdn
from twisted.internet import reactor
-from twisted.internet.defer import inlineCallbacks, returnValue, deferredGenerator, succeed
-from twext.python.filepath import CachingFilePath as FilePath
-from twext.web2.dav import davxml
-from twext.web2.dav.element.base import twisted_dav_namespace, dav_namespace, parse_date, twisted_private_namespace
-from twext.web2.dav.resource import DAVPropertyMixIn
-from twext.web2.dav.util import joinURL
-from twext.web2.http_headers import MimeType, generateContentType, ETag
+from twisted.internet.defer import inlineCallbacks, returnValue, succeed
-
-from twistedcaldav import customxml, carddavxml
-from twistedcaldav.customxml import calendarserver_namespace
-from twistedcaldav.config import config
-from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
+from twistedcaldav import carddavxml
+from twistedcaldav.directory.directory import DirectoryRecord
from twistedcaldav.directory.ldapdirectory import LdapDirectoryService
-from twistedcaldav.memcachelock import MemcacheLock, MemcacheLockTimeoutError
-from twistedcaldav.query import addressbookqueryfilter
-from twistedcaldav.vcard import Component, Property, vCardProductID
-from xmlrpclib import datetime
-
-from calendarserver.platform.darwin.od import dsattributes, dsquery
-from twisted.python.reflect import namedModule
-
import ldap
-from twistedcaldav.directory.ldapdirectory import LdapDirectoryService
from twistedcaldav.directory.opendirectorybacker import VCardRecord, getDSFilter
@@ -197,7 +170,6 @@
h = (h + hash(getattr(self, attr))) & sys.maxint
return h
- #@inlineCallbacks
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-03-13 15:44:23 UTC (rev 8849)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py 2012-03-13 15:55:46 UTC (rev 8850)
@@ -30,9 +30,7 @@
import sys
import time
-from os import listdir
-from os.path import join, abspath
-from tempfile import mkstemp, gettempdir
+from os.path import join
from random import random
from pycalendar.n import N
@@ -41,9 +39,7 @@
from socket import getfqdn
-from twisted.internet import reactor
from twisted.internet.defer import inlineCallbacks, returnValue, deferredGenerator, succeed
-from twext.python.filepath import CachingFilePath as FilePath
from twext.web2.dav import davxml
from twext.web2.dav.element.base import twisted_dav_namespace, dav_namespace, parse_date, twisted_private_namespace
from twext.web2.dav.resource import DAVPropertyMixIn
@@ -51,11 +47,9 @@
from twext.web2.http_headers import MimeType, generateContentType, ETag
-from twistedcaldav import customxml, carddavxml
-from twistedcaldav.customxml import calendarserver_namespace
+from twistedcaldav import carddavxml
from twistedcaldav.config import config
from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord
-from twistedcaldav.memcachelock import MemcacheLock, MemcacheLockTimeoutError
from twistedcaldav.query import addressbookqueryfilter
from twistedcaldav.vcard import Component, Property, vCardProductID
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120313/013c5169/attachment.html>
More information about the calendarserver-changes
mailing list