[Zope-CVS] SVN: ldapadapter/trunk/ REmove global imports of LDAPAdapter for to make sure to replace the ldap package if we run tests.

[Roger Ineichen]

Log message for revision 27865:
  REmove global imports of LDAPAdapter for to make sure to replace the ldap package if we run tests.


Changed:
  U   ldapadapter/trunk/README.txt
  U   ldapadapter/trunk/__init__.py
  U   ldapadapter/trunk/browser/configure.zcml
  U   ldapadapter/trunk/configure.zcml


-=-
Modified: ldapadapter/trunk/README.txt
===================================================================
--- ldapadapter/trunk/README.txt	2004-10-09 17:07:15 UTC (rev 27864)
+++ ldapadapter/trunk/README.txt	2004-10-09 17:40:53 UTC (rev 27865)
@@ -14,7 +14,7 @@
 
   >>> from ldapadapter.interfaces import ILDAPAdapter
   >>> from ldapadapter.interfaces import ILDAPConnection
-  >>> from ldapadapter import LDAPAdapter
+  >>> from ldapadapter.utility import LDAPAdapter
 
   >>> host = u'localhost'
   >>> port = 389

Modified: ldapadapter/trunk/__init__.py
===================================================================
--- ldapadapter/trunk/__init__.py	2004-10-09 17:07:15 UTC (rev 27864)
+++ ldapadapter/trunk/__init__.py	2004-10-09 17:40:53 UTC (rev 27865)
@@ -15,7 +15,3 @@
 
 $Id$
 """
-
-from utility import LDAPAdapter
-from utility import ManageableLDAPAdapter
-

Modified: ldapadapter/trunk/browser/configure.zcml
===================================================================
--- ldapadapter/trunk/browser/configure.zcml	2004-10-09 17:07:15 UTC (rev 27864)
+++ ldapadapter/trunk/browser/configure.zcml	2004-10-09 17:40:53 UTC (rev 27865)
@@ -18,7 +18,7 @@
         class="zope.app.utility.browser.AddRegistration"
         permission="zope.ManageServices"
         content_factory=
-            "ldapadapter.LDAPAdapter"
+            "ldapadapter.utility.LDAPAdapter"
         arguments="name interface"
         set_after_add="status"
         fields="name interface permission status"

Modified: ldapadapter/trunk/configure.zcml
===================================================================
--- ldapadapter/trunk/configure.zcml	2004-10-09 17:07:15 UTC (rev 27864)
+++ ldapadapter/trunk/configure.zcml	2004-10-09 17:40:53 UTC (rev 27865)
@@ -8,7 +8,7 @@
     <content class="ldapadapter.ManageableLDAPAdapter">
 
         <factory
-            id="ldapadapter.ManageableLDAPAdapter" />
+            id="ldapadapter.utility.ManageableLDAPAdapter" />
    
         <implements
             interface="zope.app.utility.interfaces.ILocalUtility" />