Deactivted all BBB to ensure that we use only the latest code in zope…

….app Made almost all tests pass again, except the few that heavily depended on the old way of doing things: apidoc, module, presentation
zopefoundation · Jan 9, 2005 · edf2262 · edf2262
1 parent 8c7155c
commit edf2262
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/__init__.py b/__init__.py
@@ -30,7 +30,7 @@
 from zope.app.container.contained import Contained
 from zope.app.location import Location
 from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
-from zope.app.utility.utility import queryNextUtility
+from zope.app.component import queryNextUtility
 
 class PrincipalAnnotationUtility(Persistent, Contained):
     """Stores `IAnnotations` for `IPrinicipals`.

diff --git a/tests.py b/tests.py
@@ -23,10 +23,8 @@
 from zope.app.principalannotation import PrincipalAnnotationUtility
 from zope.app.principalannotation import AnnotationsForPrincipal
 from zope.app.security.interfaces import IPrincipal
-from zope.app.site.tests.placefulsetup import PlacefulSetup
-from zope.app.tests import setup
-from zope.app.tests import ztapi
-from zope.app.utility.utility import LocalUtilityService
+from zope.app.component.testing import PlacefulSetup
+from zope.app.testing import ztapi, setup
 from interfaces import IPrincipalAnnotationUtility
 
 class Principal(object):
@@ -63,7 +61,6 @@ def testGetSimple(self):
     def testGetFromLayered(self):
         princeSomebody = Principal('somebody')
         sm1 = self.makeSite('folder1')
-        setup.addService(sm1, 'Utilities', LocalUtilityService())
         subUtil = setup.addUtility(sm1, '', IPrincipalAnnotationUtility,
                                    PrincipalAnnotationUtility())