Merge 8ceca66 into a711e59

CHANGES.rst

@@ -5,14 +5,15 @@
 4.2.2 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Fix more ``DeprecationWarnings``. See `issue 10
+  <https://github.com/zopefoundation/zope.site/issues/10>`_.
 
 
 4.2.1 (2018-10-11)
 ==================
 
-- Use current location for `UtilityRegistration` and `IUtilityRegistration`
-  classes.
+- Use current import location for ``UtilityRegistration`` and ``IUtilityRegistration``
+  classes to avoid ``DeprecationWarning``.
 
 
 4.2.0 (2018-10-09)
@@ -33,7 +34,7 @@
   with ``zope.deprecation``.  These will be removed in version 5.0.
   They all have replacements in ``zope.component``.
 
-- Added implementation for _p_repr in LocalSiteManager. 
+- Added implementation for _p_repr in LocalSiteManager.
   For further information see github issue #8.
 
 - Reach 100% test coverage and ensure we remain there.

setup.py

@@ -97,9 +97,9 @@ def alltests():
           'zope.container',
           'zope.deprecation',
           'zope.security',
-          'zope.component',
+          'zope.component >= 4.5.0',
           'zope.event',
-          'zope.interface',
+          'zope.interface >= 4.5.0',
           'zope.lifecycleevent',
           'zope.location',
       ],

src/zope/site/configure.zcml

@@ -21,7 +21,7 @@
         interface="zope.container.interfaces.IReadContainer" />
     <require
         permission="zope.ManageSite"
-        interface="zope.component.interfaces.IComponentLookup
+        interface="zope.interface.interfaces.IComponentLookup
                    zope.container.interfaces.IWriteContainer" />
   </class>
 
@@ -47,7 +47,7 @@
   </class>
 
   <adapter
-      for="zope.component.interfaces.IComponentLookup"
+      for="zope.interface.interfaces.IComponentLookup"
       provides="zope.filerepresentation.interfaces.IDirectoryFactory"
       factory=".site.SMFolderFactory"
       permission="zope.ManageContent"

src/zope/site/folder.py

@@ -50,7 +50,7 @@ class FolderSublocations(object):
 
       >>> sm = Contained()
       >>> from zope.interface import directlyProvides
-      >>> from zope.component.interfaces import IComponentLookup
+      >>> from zope.interface.interfaces import IComponentLookup
       >>> directlyProvides(sm, IComponentLookup)
       >>> folder.setSiteManager(sm)
       >>> directlyProvides(folder, zope.component.interfaces.ISite)

src/zope/site/interfaces.py

@@ -15,7 +15,7 @@
 """
 
 import zope.interface
-import zope.component.interfaces
+import zope.interface.interfaces
 import zope.container.interfaces
 import zope.container.constraints
 import zope.location.interfaces
@@ -37,7 +37,7 @@ def __init__(self, manager):
         self.manager = manager
 
 
-class ILocalSiteManager(zope.component.interfaces.IComponents):
+class ILocalSiteManager(zope.interface.interfaces.IComponents):
     """Site Managers act as containers for registerable components.
 
     If a Site Manager is asked for an adapter or utility, it checks for those

src/zope/site/site.py

@@ -32,7 +32,8 @@
 import zope.location
 import zope.location.interfaces
 
-from zope.component.interfaces import ComponentLookupError
+from zope.interface.interfaces import IComponentLookup
+from zope.interface.interfaces import ComponentLookupError
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.filerepresentation.interfaces import IDirectoryFactory
 
@@ -86,7 +87,7 @@ def setSiteManager(self, sm):
         if zope.component.interfaces.ISite.providedBy(self):
             raise TypeError("Already a site")
 
-        if zope.component.interfaces.IComponentLookup.providedBy(sm):
+        if IComponentLookup.providedBy(sm):
             self._sm = sm
         else:
             raise ValueError('setSiteManager requires an IComponentLookup')
@@ -212,7 +213,7 @@ def clearThreadSiteSubscriber(event):
 
 
 @zope.component.adapter(zope.interface.Interface)
-@zope.interface.implementer(zope.component.interfaces.IComponentLookup)
+@zope.interface.implementer(IComponentLookup)
 def SiteManagerAdapter(ob):
     """An adapter from :class:`~.ILocation` to :class:`~.IComponentLookup`.
 

src/zope/site/site.rst

@@ -73,13 +73,13 @@ There is also an adapter you can use to get the next site manager from any
 location:
 
   >>> myfolder['mysubfolder'] = folder.Folder()
-  >>> import zope.component
-  >>> zope.component.interfaces.IComponentLookup(myfolder['mysubfolder']) is sm
+  >>> import zope.interface.interfaces
+  >>> zope.interface.interfaces.IComponentLookup(myfolder['mysubfolder']) is sm
   True
 
 If the location passed is a site, the site manager of that site is returned:
 
-  >>> zope.component.interfaces.IComponentLookup(myfolder) is sm
+  >>> zope.interface.interfaces.IComponentLookup(myfolder) is sm
   True
 
 

src/zope/site/testing.py

@@ -20,7 +20,7 @@
 import zope.container.interfaces
 import zope.container.testing
 import zope.site.site
-from zope.component.interfaces import IComponentLookup
+from zope.interface.interfaces import IComponentLookup
 from zope.interface import Interface
 from zope.site import LocalSiteManager, SiteManagerAdapter
 from zope.site.folder import rootFolder

src/zope/site/tests/test_bwc.py

@@ -14,16 +14,23 @@
 # Test BWC shims
 
 import unittest
+import warnings
 
 class TestNext(unittest.TestCase):
 
     def test_import(self):
-        from zope.site import next as FUT
-        self.assertTrue(hasattr(FUT, 'queryNextUtility'))
+        with warnings.catch_warnings():
+            warnings.simplefilter('ignore')
+
+            from zope.site import next as FUT
+            self.assertTrue(hasattr(FUT, 'queryNextUtility'))
 
 
 class TestHooks(unittest.TestCase):
 
     def test_import(self):
-        from zope.site import hooks as FUT
-        self.assertTrue(hasattr(FUT, 'setSite'))
+        with warnings.catch_warnings():
+            warnings.simplefilter('ignore')
+
+            from zope.site import hooks as FUT
+            self.assertTrue(hasattr(FUT, 'setSite'))

src/zope/site/tests/test_registration.py

@@ -68,8 +68,8 @@ def test_deghostification_of_persistent_adapter_registries(self):
 
         # We want to make sure that we see updates correctly.
 
-        import ZODB.tests.util
-        db = ZODB.tests.util.DB()
+        from ZODB.MappingStorage import DB
+        db = DB()
         tm1 = transaction.TransactionManager()
         c1 = db.open(transaction_manager=tm1)
         r1 = zope.site.site._LocalAdapterRegistry((base,))