[Checkins] SVN: zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/ z.i.component -> z.i.registry

[Chris McDonough]

Log message for revision 122762:
  z.i.component -> z.i.registry

Changed:
  U   zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/globalregistry.py
  U   zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/hooks.txt
  U   zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/persistentregistry.py
  U   zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/registry.py
  U   zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/tests.py

-=-
Modified: zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/globalregistry.py
===================================================================
--- zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/globalregistry.py	2011-09-10 11:02:18 UTC (rev 122761)
+++ zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/globalregistry.py	2011-09-10 11:03:10 UTC (rev 122762)
@@ -15,7 +15,7 @@
 """
 from zope.interface import implements
 from zope.interface.adapter import AdapterRegistry
-from zope.interface.component import Components
+from zope.interface.registry import Components
 from zope.component.interfaces import IComponentLookup
 
 def GAR(components, registryName):

Modified: zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/hooks.txt
===================================================================
--- zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/hooks.txt	2011-09-10 11:02:18 UTC (rev 122761)
+++ zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/hooks.txt	2011-09-10 11:03:10 UTC (rev 122762)
@@ -26,7 +26,7 @@
 ``getSiteManager`` method, which is specified by
 ``zope.component.interfaces.IPossibleSite``:
 
->>> from zope.interface.component import Components
+>>> from zope.interface.registry import Components
 >>> class Site(object):
 ...     def __init__(self):
 ...         self.registry = Components('components')

Modified: zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/persistentregistry.py
===================================================================
--- zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/persistentregistry.py	2011-09-10 11:02:18 UTC (rev 122761)
+++ zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/persistentregistry.py	2011-09-10 11:03:10 UTC (rev 122762)
@@ -17,7 +17,7 @@
 import persistent.list
 import zope.interface.adapter
 
-from zope.interface.component import Components
+from zope.interface.registry import Components
 
 class PersistentAdapterRegistry(
     zope.interface.adapter.VerifyingAdapterRegistry,

Modified: zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/registry.py
===================================================================
--- zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/registry.py	2011-09-10 11:02:18 UTC (rev 122761)
+++ zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/registry.py	2011-09-10 11:03:10 UTC (rev 122762)
@@ -14,14 +14,14 @@
 """Basic components support
 """
 # BBB, import component-related from zope.interface
-from zope.interface.component import Components
-from zope.interface.component import _getUtilityProvided
-from zope.interface.component import _getAdapterProvided
-from zope.interface.component import _getAdapterRequired
-from zope.interface.component import UtilityRegistration
-from zope.interface.component import AdapterRegistration
-from zope.interface.component import SubscriptionRegistration
-from zope.interface.component import HandlerRegistration
+from zope.interface.registry import Components
+from zope.interface.registry import _getUtilityProvided
+from zope.interface.registry import _getAdapterProvided
+from zope.interface.registry import _getAdapterRequired
+from zope.interface.registry import UtilityRegistration
+from zope.interface.registry import AdapterRegistration
+from zope.interface.registry import SubscriptionRegistration
+from zope.interface.registry import HandlerRegistration
 
 from zope.component._api import handle
 from zope.component._declaration import adapter

Modified: zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/tests.py
===================================================================
--- zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/tests.py	2011-09-10 11:02:18 UTC (rev 122761)
+++ zope.component/branches/chrism-zope.interface-componentregistry/src/zope/component/tests.py	2011-09-10 11:03:10 UTC (rev 122762)
@@ -947,7 +947,7 @@
     ...     print "| Factory 2 is here"
     >>> class Event(object):
     ...     zope.interface.implements(I)
-    >>> from zope.interface.component import Components
+    >>> from zope.interface.registry import Components
     >>> registry = Components()
     >>> registry.registerHandler(factory1, [I,])
     >>> registry.registerHandler(factory2, [I,])
@@ -986,7 +986,7 @@
 
     Now, let's create two registries and set up the bases hierarchy::
 
-      >>> from zope.interface.component import Components
+      >>> from zope.interface.registry import Components
       >>> sm1 = Components('sm1', bases=(gsm, ))
       >>> sm1_1 = Components('sm1_1', bases=(sm1, ))
 
@@ -1064,8 +1064,8 @@
     We've observed utilities getting left in _subscribers when they
     get unregistered.
 
-    >>> import zope.interface.component
-    >>> reg = zope.interface.component.Components()
+    >>> import zope.interface.registry
+    >>> reg = zope.interface.registry.Components()
     >>> class C:
     ...     def __init__(self, name):
     ...         self.name = name
@@ -1097,7 +1097,7 @@
     method to get the registry where to register the components. This makes
     possible to hook ``getSiteManager`` before loading a ZCML file:
 
-    >>> from zope.interface.component import Components
+    >>> from zope.interface.registry import Components
     >>> registry = Components()
     >>> def dummy(context=None):
     ...     return registry