[Checkins] SVN: zope.authentication/trunk/ Get rid of temporary zope.site dependency, because get/queryNextUtility is now in zope.component.

[Dan Korostelev]

Log message for revision 97941:
  Get rid of temporary zope.site dependency, because get/queryNextUtility is now in zope.component.

Changed:
  U   zope.authentication/trunk/buildout.cfg
  U   zope.authentication/trunk/setup.py
  U   zope.authentication/trunk/src/zope/authentication/principal.py

-=-
Modified: zope.authentication/trunk/buildout.cfg
===================================================================
--- zope.authentication/trunk/buildout.cfg	2009-03-12 00:07:28 UTC (rev 97940)
+++ zope.authentication/trunk/buildout.cfg	2009-03-12 00:09:21 UTC (rev 97941)
@@ -1,5 +1,5 @@
 [buildout]
-develop = .
+develop = . ../zope.component
 parts = test coverage-test coverage-report
 
 [test]

Modified: zope.authentication/trunk/setup.py
===================================================================
--- zope.authentication/trunk/setup.py	2009-03-12 00:07:28 UTC (rev 97940)
+++ zope.authentication/trunk/setup.py	2009-03-12 00:09:21 UTC (rev 97941)
@@ -64,11 +64,6 @@
                         'zope.publisher', # XXX: this is for ILoginPassword
                                           # adapters that should be moved
                                           # elsewhere, probably to zope.publisher
-
-                        'zope.site', # XXX: this shouldn't be needed
-                        'zope.app.component', # XXX: this is for testing, until
-                        'zope.app.testing',   # we got testingNextUtility in
-                                              # a sane place or rewrite tests.
                         ],
       include_package_data = True,
       zip_safe = False,

Modified: zope.authentication/trunk/src/zope/authentication/principal.py
===================================================================
--- zope.authentication/trunk/src/zope/authentication/principal.py	2009-03-12 00:07:28 UTC (rev 97940)
+++ zope.authentication/trunk/src/zope/authentication/principal.py	2009-03-12 00:09:21 UTC (rev 97941)
@@ -16,10 +16,9 @@
 $Id$
 """
 from zope.browser.interfaces import ITerms
-from zope.component import getUtility, adapts
+from zope.component import getUtility, queryNextUtility, adapts
 from zope.interface import implements, Interface
 from zope.schema.interfaces import ISourceQueriables
-from zope.site.next import queryNextUtility # XXX: move this to zope.component
 
 from zope.authentication.interfaces import IAuthentication, IPrincipalSource
 from zope.authentication.interfaces import PrincipalLookupError
@@ -135,7 +134,7 @@
         ...         return ('4', 4),
         >>> dummy3 = DummyUtility3()
 
-        >>> from zope.app.component.testing import testingNextUtility
+        >>> from zope.component.nexttesting import testingNextUtility
         >>> testingNextUtility(dummy1, dummy2, IAuthentication)
         >>> testingNextUtility(dummy2, dummy3, IAuthentication)