[CalendarServer-changes] [12392] twext/trunk/twext/who/ldap

[source_changes at macosforge.org]

Revision: 12392
          http://trac.calendarserver.org//changeset/12392
Author:   wsanchez at apple.com
Date:     2014-01-17 19:16:29 -0800 (Fri, 17 Jan 2014)
Log Message:
-----------
Clean up exports.

Modified Paths:
--------------
    twext/trunk/twext/who/ldap/__init__.py
    twext/trunk/twext/who/ldap/_service.py

Modified: twext/trunk/twext/who/ldap/__init__.py
===================================================================
--- twext/trunk/twext/who/ldap/__init__.py	2014-01-18 03:10:38 UTC (rev 12391)
+++ twext/trunk/twext/who/ldap/__init__.py	2014-01-18 03:16:29 UTC (rev 12392)
@@ -16,19 +16,25 @@
 
 __all__ = [
     "LDAPError",
+    "LDAPConfigurationError",
     "LDAPConnectionError",
-    # "LDAPQueryError",
-    # "LDAPDataError",
+    "LDAPBindAuthError",
+    "RecordTypeSchema",
     "DirectoryService",
+    "LDAPAttribute",
+    "LDAPObjectClass",
 ]
 
 
-try:
-    from ._service import (
-        LDAPError, LDAPConnectionError,  # LDAPQueryError, LDAPDataError,
-        DirectoryService,
-    )
-except ImportError:
-    raise
-    LDAPError = LDAPConnectionError = None
-    # LDAPQueryError = LDAPDataError = None
+from ._service import (
+    LDAPError,
+    LDAPConfigurationError,
+    LDAPConnectionError,
+    LDAPBindAuthError,
+    RecordTypeSchema,
+    DirectoryService,
+)
+from ._constants import (
+    LDAPAttribute,
+    LDAPObjectClass,
+)

Modified: twext/trunk/twext/who/ldap/_service.py
===================================================================
--- twext/trunk/twext/who/ldap/_service.py	2014-01-18 03:10:38 UTC (rev 12391)
+++ twext/trunk/twext/who/ldap/_service.py	2014-01-18 03:16:29 UTC (rev 12392)
@@ -90,20 +90,6 @@
 
 
 
-# class LDAPQueryError(LDAPError):
-#     """
-#     LDAP query error.
-#     """
-
-
-
-# class LDAPDataError(LDAPError):
-#     """
-#     LDAP data error.
-#     """
-
-
-
 #
 # LDAP schema descriptions
 #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/b5d3a619/attachment.html>