[CalendarServer-changes] [12220] twext/trunk/twext/who

[source_changes at macosforge.org]

Revision: 12220
          http://trac.calendarserver.org//changeset/12220
Author:   wsanchez at apple.com
Date:     2014-01-02 16:31:22 -0800 (Thu, 02 Jan 2014)
Log Message:
-----------
Don't export DirectoryRecord classes.

Modified Paths:
--------------
    twext/trunk/twext/who/aggregate.py
    twext/trunk/twext/who/opendirectory/__init__.py
    twext/trunk/twext/who/test/test_aggregate.py
    twext/trunk/twext/who/xml.py

Modified: twext/trunk/twext/who/aggregate.py
===================================================================
--- twext/trunk/twext/who/aggregate.py	2014-01-03 00:20:23 UTC (rev 12219)
+++ twext/trunk/twext/who/aggregate.py	2014-01-03 00:31:22 UTC (rev 12220)
@@ -21,7 +21,6 @@
 
 __all__ = [
     "DirectoryService",
-    "DirectoryRecord",
 ]
 
 from itertools import chain
@@ -30,7 +29,7 @@
 
 from .idirectory import DirectoryConfigurationError, IDirectoryService
 from .directory import (
-    DirectoryService as BaseDirectoryService, DirectoryRecord
+    DirectoryService as BaseDirectoryService
 )
 from .util import ConstantsContainer
 

Modified: twext/trunk/twext/who/opendirectory/__init__.py
===================================================================
--- twext/trunk/twext/who/opendirectory/__init__.py	2014-01-03 00:20:23 UTC (rev 12219)
+++ twext/trunk/twext/who/opendirectory/__init__.py	2014-01-03 00:31:22 UTC (rev 12220)
@@ -31,5 +31,5 @@
 from ._service import (
     OpenDirectoryError, OpenDirectoryConnectionError, OpenDirectoryQueryError,
     OpenDirectoryDataError,
-    DirectoryService, DirectoryRecord,
+    DirectoryService,
 )

Modified: twext/trunk/twext/who/test/test_aggregate.py
===================================================================
--- twext/trunk/twext/who/test/test_aggregate.py	2014-01-03 00:20:23 UTC (rev 12219)
+++ twext/trunk/twext/who/test/test_aggregate.py	2014-01-03 00:31:22 UTC (rev 12220)
@@ -22,7 +22,8 @@
 from twisted.trial import unittest
 
 from ..idirectory import IDirectoryService, DirectoryConfigurationError
-from ..aggregate import DirectoryService, DirectoryRecord
+from ..directory import DirectoryRecord
+from ..aggregate import DirectoryService
 from ..util import ConstantsContainer
 from . import test_directory, test_xml
 from .test_xml import (

Modified: twext/trunk/twext/who/xml.py
===================================================================
--- twext/trunk/twext/who/xml.py	2014-01-03 00:20:23 UTC (rev 12219)
+++ twext/trunk/twext/who/xml.py	2014-01-03 00:31:22 UTC (rev 12220)
@@ -25,7 +25,6 @@
 __all__ = [
     "ParseError",
     "DirectoryService",
-    "DirectoryRecord",
 ]
 
 from time import time
@@ -36,8 +35,6 @@
     tostring as etreeToString, Element as XMLElement,
 )
 
-from zope.interface import implementer
-
 from twisted.python.constants import Values, ValueConstant
 from twisted.internet.defer import fail
 
@@ -45,7 +42,6 @@
     DirectoryServiceError,
     NoSuchRecordError, UnknownRecordTypeError,
     RecordType, FieldName as BaseFieldName,
-    IPlaintextPasswordVerifier, IHTTPDigestVerifier,
 )
 from .index import (
     DirectoryService as BaseDirectoryService,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/42379bf3/attachment.html>