[Checkins] SVN: zope.component/tseaver-test_cleanup/ Normalize imports.

[Tres Seaver]

Log message for revision 127108:
  Normalize imports.

Changed:
  _U  zope.component/tseaver-test_cleanup/
  U   zope.component/tseaver-test_cleanup/src/zope/component/hooks.py
  U   zope.component/tseaver-test_cleanup/src/zope/component/tests/test_hooks.py

-=-
Modified: zope.component/tseaver-test_cleanup/src/zope/component/hooks.py
===================================================================
--- zope.component/tseaver-test_cleanup/src/zope/component/hooks.py	2012-06-26 23:00:29 UTC (rev 127107)
+++ zope.component/tseaver-test_cleanup/src/zope/component/hooks.py	2012-06-26 23:00:33 UTC (rev 127108)
@@ -17,16 +17,18 @@
 
 import contextlib
 import threading
-import zope.component
 
 try:
-    import zope.security.proxy
+    from zope.security.proxy import removeSecurityProxy
 except ImportError: #pragma NO COVER
-    SECURITY_SUPPORT = False
-else:
-    SECURITY_SUPPORT = True
+    def removeSecurityProxy(x):
+        return x
 
+from zope.component.globalregistry import getGlobalSiteManager
+from zope.component.interfaces import ComponentLookupError
+from zope.component.interfaces import IComponentLookup
 
+
 class read_property(object):
     """Descriptor for property-like computed attributes.
 
@@ -44,7 +46,7 @@
 
 class SiteInfo(threading.local):
     site = None
-    sm = zope.component.getGlobalSiteManager()
+    sm = getGlobalSiteManager()
 
     @read_property
     def adapter_hook(self):
@@ -56,7 +58,7 @@
 
 def setSite(site=None):
     if site is None:
-        sm = zope.component.getGlobalSiteManager()
+        sm = getGlobalSiteManager()
     else:
 
         # We remove the security proxy because there's no way for
@@ -66,8 +68,7 @@
         # once site managers do less.  There's probably no good reason why
         # they can't be proxied.  Well, except maybe for performance.
 
-        if SECURITY_SUPPORT:
-            site = zope.security.proxy.removeSecurityProxy(site)
+        site = removeSecurityProxy(site)
         # The getSiteManager method is defined by IPossibleSite.
         sm = site.getSiteManager()
 
@@ -107,28 +108,29 @@
     # We should really look look at this again though, especially
     # once site managers do less.  There's probably no good reason why
     # they can't be proxied.  Well, except maybe for performance.
-    sm = zope.component.interfaces.IComponentLookup(
-        context, zope.component.getGlobalSiteManager())
-    if SECURITY_SUPPORT:
-        sm = zope.security.proxy.removeSecurityProxy(sm)
+    sm = IComponentLookup(
+        context, getGlobalSiteManager())
+    sm = removeSecurityProxy(sm)
     return sm
 
 
 def adapter_hook(interface, object, name='', default=None):
     try:
         return siteinfo.adapter_hook(interface, object, name, default)
-    except zope.component.interfaces.ComponentLookupError:
+    except ComponentLookupError:
         return default
 
 
 def setHooks():
-    zope.component.adapter_hook.sethook(adapter_hook)
-    zope.component.getSiteManager.sethook(getSiteManager)
+    from zope.component import _api
+    _api.adapter_hook.sethook(adapter_hook)
+    _api.getSiteManager.sethook(getSiteManager)
 
 def resetHooks():
     # Reset hookable functions to original implementation.
-    zope.component.adapter_hook.reset()
-    zope.component.getSiteManager.reset()
+    from zope.component import _api
+    _api.adapter_hook.reset()
+    _api.getSiteManager.reset()
 
 # Clear the site thread global
 clearSite = setSite

Modified: zope.component/tseaver-test_cleanup/src/zope/component/tests/test_hooks.py
===================================================================
--- zope.component/tseaver-test_cleanup/src/zope/component/tests/test_hooks.py	2012-06-26 23:00:29 UTC (rev 127107)
+++ zope.component/tseaver-test_cleanup/src/zope/component/tests/test_hooks.py	2012-06-26 23:00:33 UTC (rev 127108)
@@ -268,7 +268,7 @@
         return setHooks()
 
     def test_it(self):
-        import zope.component
+        import zope.component._api
         from zope.component import hooks
         class _Hook(object):
             def __init__(self):
@@ -277,7 +277,7 @@
                 self._hooked = value
         adapter_hook = _Hook()
         getSiteManager = _Hook()
-        with _Monkey(zope.component,
+        with _Monkey(zope.component._api,
                      adapter_hook=adapter_hook,
                      getSiteManager=getSiteManager):
             self._callFUT()
@@ -292,7 +292,7 @@
         return resetHooks()
 
     def test_it(self):
-        import zope.component
+        import zope.component._api
         class _Hook(object):
             def __init__(self):
                 self._reset = False
@@ -300,7 +300,7 @@
                 self._reset = True
         adapter_hook = _Hook()
         getSiteManager = _Hook()
-        with _Monkey(zope.component,
+        with _Monkey(zope.component._api,
                      adapter_hook=adapter_hook,
                      getSiteManager=getSiteManager):
             self._callFUT()