[Checkins] SVN: zope.component/chrism-zope.interface-componentregistry/ Depend on zope.interface branch chrism-componentregistry rather than zope.registry trunk
Chris McDonough
chrism at plope.com
Thu Sep 8 23:54:34 EST 2011
Log message for revision 122755:
Depend on zope.interface branch chrism-componentregistry rather than zope.registry trunk
Changed:
_U zope.component/chrism-zope.interface-componentregistry/
U zope.component/chrism-zope.interface-componentregistry/buildout.cfg
U zope.component/chrism-zope.interface-componentregistry/setup.py
_U zope.component/chrism-zope.interface-componentregistry/src/
U zope.component/chrism-zope.interface-componentregistry/src/zope/component/_declaration.py
U zope.component/chrism-zope.interface-componentregistry/src/zope/component/globalregistry.py
U zope.component/chrism-zope.interface-componentregistry/src/zope/component/hooks.txt
U zope.component/chrism-zope.interface-componentregistry/src/zope/component/interfaces.py
U zope.component/chrism-zope.interface-componentregistry/src/zope/component/persistentregistry.py
U zope.component/chrism-zope.interface-componentregistry/src/zope/component/registry.py
U zope.component/chrism-zope.interface-componentregistry/src/zope/component/tests.py
-=-
Property changes on: zope.component/chrism-zope.interface-componentregistry
___________________________________________________________________
Modified: svn:ignore
- bin
build
dist
lib
develop-eggs
eggs
parts
.installed.cfg
coverage
+ bin
build
dist
lib
develop-eggs
eggs
parts
.installed.cfg
coverage
.mr.developer.cfg
Modified: zope.component/chrism-zope.interface-componentregistry/buildout.cfg
===================================================================
--- zope.component/chrism-zope.interface-componentregistry/buildout.cfg 2011-09-09 04:52:13 UTC (rev 122754)
+++ zope.component/chrism-zope.interface-componentregistry/buildout.cfg 2011-09-09 04:54:34 UTC (rev 122755)
@@ -1,8 +1,13 @@
[buildout]
-develop = . src/registry
+develop = .
parts = test test_c_hookable python sphinx coverage-test coverage-report
unzip = true
+extensions = mr.developer
+auto-checkout = zope.interface
+[sources]
+zope.interface = svn svn+ssh://svn.zope.org/repos/main/zope.interface/branches/chrism-componentregistry
+
[test]
recipe = zc.recipe.testrunner
eggs = zope.component [test,zcml,security,persistentregistry]
Modified: zope.component/chrism-zope.interface-componentregistry/setup.py
===================================================================
--- zope.component/chrism-zope.interface-componentregistry/setup.py 2011-09-09 04:52:13 UTC (rev 122754)
+++ zope.component/chrism-zope.interface-componentregistry/setup.py 2011-09-09 04:54:34 UTC (rev 122755)
@@ -71,7 +71,6 @@
install_requires=['setuptools',
'zope.interface',
'zope.event',
- 'zope.registry',
],
include_package_data = True,
zip_safe = False,
Property changes on: zope.component/chrism-zope.interface-componentregistry/src
___________________________________________________________________
Modified: svn:ignore
- zope.component.egg-info
+ zope.component.egg-info
zope.interface
Modified: svn:externals
- registry svn://svn.zope.org/repos/main/zope.registry/trunk
+
Modified: zope.component/chrism-zope.interface-componentregistry/src/zope/component/_declaration.py
===================================================================
--- zope.component/chrism-zope.interface-componentregistry/src/zope/component/_declaration.py 2011-09-09 04:52:13 UTC (rev 122754)
+++ zope.component/chrism-zope.interface-componentregistry/src/zope/component/_declaration.py 2011-09-09 04:54:34 UTC (rev 122755)
@@ -13,9 +13,48 @@
##############################################################################
"""Adapter declarations
"""
-# BBB 2011-07-09, import _declaration from zope.registry
-from zope.registry._declaration import adapter
-from zope.registry._declaration import adapts
-from zope.registry._declaration import adaptedBy
-from zope.registry._declaration import _adapts_descr
-from zope.registry._declaration import _class_types
+import types
+import sys
+
+class adapter:
+
+ def __init__(self, *interfaces):
+ self.interfaces = interfaces
+
+ def __call__(self, ob):
+ if isinstance(ob, _class_types):
+ ob.__component_adapts__ = _adapts_descr(self.interfaces)
+ else:
+ ob.__component_adapts__ = self.interfaces
+
+ return ob
+
+def adapts(*interfaces):
+ frame = sys._getframe(1)
+ locals = frame.f_locals
+
+ # Try to make sure we were called from a class def. In 2.2.0 we can't
+ # check for __module__ since it doesn't seem to be added to the locals
+ # until later on.
+ if (locals is frame.f_globals) or (
+ ('__module__' not in locals) and sys.version_info[:3] > (2, 2, 0)):
+ raise TypeError("adapts can be used only from a class definition.")
+
+ if '__component_adapts__' in locals:
+ raise TypeError("adapts can be used only once in a class definition.")
+
+ locals['__component_adapts__'] = _adapts_descr(interfaces)
+
+def adaptedBy(ob):
+ return getattr(ob, '__component_adapts__', None)
+
+_class_types = type, types.ClassType
+
+class _adapts_descr(object):
+ def __init__(self, interfaces):
+ self.interfaces = interfaces
+
+ def __get__(self, inst, cls):
+ if inst is None:
+ return self.interfaces
+ raise AttributeError('__component_adapts__')
Modified: zope.component/chrism-zope.interface-componentregistry/src/zope/component/globalregistry.py
===================================================================
--- zope.component/chrism-zope.interface-componentregistry/src/zope/component/globalregistry.py 2011-09-09 04:52:13 UTC (rev 122754)
+++ zope.component/chrism-zope.interface-componentregistry/src/zope/component/globalregistry.py 2011-09-09 04:54:34 UTC (rev 122755)
@@ -15,8 +15,7 @@
"""
from zope.interface import implements
from zope.interface.adapter import AdapterRegistry
-from zope.registry import Components
-from zope.component.interfaces import ComponentLookupError
+from zope.interface.component import Components
from zope.component.interfaces import IComponentLookup
def GAR(components, registryName):
Modified: zope.component/chrism-zope.interface-componentregistry/src/zope/component/hooks.txt
===================================================================
--- zope.component/chrism-zope.interface-componentregistry/src/zope/component/hooks.txt 2011-09-09 04:52:13 UTC (rev 122754)
+++ zope.component/chrism-zope.interface-componentregistry/src/zope/component/hooks.txt 2011-09-09 04:54:34 UTC (rev 122755)
@@ -26,7 +26,7 @@
``getSiteManager`` method, which is specified by
``zope.component.interfaces.IPossibleSite``:
->>> from zope.registry import Components
+>>> from zope.interface.component import Components
>>> class Site(object):
... def __init__(self):
... self.registry = Components('components')
Modified: zope.component/chrism-zope.interface-componentregistry/src/zope/component/interfaces.py
===================================================================
--- zope.component/chrism-zope.interface-componentregistry/src/zope/component/interfaces.py 2011-09-09 04:52:13 UTC (rev 122754)
+++ zope.component/chrism-zope.interface-componentregistry/src/zope/component/interfaces.py 2011-09-09 04:54:34 UTC (rev 122755)
@@ -17,30 +17,30 @@
from zope.interface import Interface
from zope.interface import implements
-# BBB 2011-07-09, import interfaces from zope.registry
-from zope.registry.interfaces import ComponentLookupError
-from zope.registry.interfaces import Invalid
-from zope.registry.interfaces import Misused
-from zope.registry.interfaces import IObjectEvent
-from zope.registry.interfaces import ObjectEvent
-from zope.registry.interfaces import IComponentArchitecture
-from zope.registry.interfaces import IComponentLookup
-from zope.registry.interfaces import IComponentRegistrationConvenience
-from zope.registry.interfaces import IRegistry
-from zope.registry.interfaces import IFactory
-from zope.registry.interfaces import IRegistration
-from zope.registry.interfaces import IUtilityRegistration
-from zope.registry.interfaces import _IBaseAdapterRegistration
-from zope.registry.interfaces import IAdapterRegistration
-from zope.registry.interfaces import ISubscriptionAdapterRegistration
-from zope.registry.interfaces import IHandlerRegistration
-from zope.registry.interfaces import IRegistrationEvent
-from zope.registry.interfaces import RegistrationEvent
-from zope.registry.interfaces import IRegistered
-from zope.registry.interfaces import Registered
-from zope.registry.interfaces import IUnregistered
-from zope.registry.interfaces import Unregistered
-from zope.registry.interfaces import IComponentRegistry
-from zope.registry.interfaces import IComponents
-from zope.registry.interfaces import IPossibleSite
-from zope.registry.interfaces import ISite
+# BBB 2011-09-09, import interfaces from zope.interface
+from zope.interface.interfaces import ComponentLookupError
+from zope.interface.interfaces import Invalid
+from zope.interface.interfaces import Misused
+from zope.interface.interfaces import IObjectEvent
+from zope.interface.interfaces import ObjectEvent
+from zope.interface.interfaces import IComponentArchitecture
+from zope.interface.interfaces import IComponentLookup
+from zope.interface.interfaces import IComponentRegistrationConvenience
+from zope.interface.interfaces import IRegistry
+from zope.interface.interfaces import IFactory
+from zope.interface.interfaces import IRegistration
+from zope.interface.interfaces import IUtilityRegistration
+from zope.interface.interfaces import _IBaseAdapterRegistration
+from zope.interface.interfaces import IAdapterRegistration
+from zope.interface.interfaces import ISubscriptionAdapterRegistration
+from zope.interface.interfaces import IHandlerRegistration
+from zope.interface.interfaces import IRegistrationEvent
+from zope.interface.interfaces import RegistrationEvent
+from zope.interface.interfaces import IRegistered
+from zope.interface.interfaces import Registered
+from zope.interface.interfaces import IUnregistered
+from zope.interface.interfaces import Unregistered
+from zope.interface.interfaces import IComponentRegistry
+from zope.interface.interfaces import IComponents
+from zope.interface.interfaces import IPossibleSite
+from zope.interface.interfaces import ISite
Modified: zope.component/chrism-zope.interface-componentregistry/src/zope/component/persistentregistry.py
===================================================================
--- zope.component/chrism-zope.interface-componentregistry/src/zope/component/persistentregistry.py 2011-09-09 04:52:13 UTC (rev 122754)
+++ zope.component/chrism-zope.interface-componentregistry/src/zope/component/persistentregistry.py 2011-09-09 04:54:34 UTC (rev 122755)
@@ -17,7 +17,7 @@
import persistent.list
import zope.interface.adapter
-from zope.registry import Components
+from zope.interface.component import Components
class PersistentAdapterRegistry(
zope.interface.adapter.VerifyingAdapterRegistry,
Modified: zope.component/chrism-zope.interface-componentregistry/src/zope/component/registry.py
===================================================================
--- zope.component/chrism-zope.interface-componentregistry/src/zope/component/registry.py 2011-09-09 04:52:13 UTC (rev 122754)
+++ zope.component/chrism-zope.interface-componentregistry/src/zope/component/registry.py 2011-09-09 04:54:34 UTC (rev 122755)
@@ -13,15 +13,15 @@
##############################################################################
"""Basic components support
"""
-# BBB 2011-07-10, import registry from zope.registry
-from zope.registry import Components
-from zope.registry import _getUtilityProvided
-from zope.registry import _getAdapterProvided
-from zope.registry import _getAdapterRequired
-from zope.registry import UtilityRegistration
-from zope.registry import AdapterRegistration
-from zope.registry import SubscriptionRegistration
-from zope.registry import HandlerRegistration
+# 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.component._api import handle
from zope.component._declaration import adapter
Modified: zope.component/chrism-zope.interface-componentregistry/src/zope/component/tests.py
===================================================================
--- zope.component/chrism-zope.interface-componentregistry/src/zope/component/tests.py 2011-09-09 04:52:13 UTC (rev 122754)
+++ zope.component/chrism-zope.interface-componentregistry/src/zope/component/tests.py 2011-09-09 04:54:34 UTC (rev 122755)
@@ -947,7 +947,7 @@
... print "| Factory 2 is here"
>>> class Event(object):
... zope.interface.implements(I)
- >>> from zope.registry import Components
+ >>> from zope.interface.component 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.registry import Components
+ >>> from zope.interface.component 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.registry
- >>> reg = zope.registry.Components()
+ >>> import zope.interface.component
+ >>> reg = zope.interface.component.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.registry import Components
+ >>> from zope.interface.component import Components
>>> registry = Components()
>>> def dummy(context=None):
... return registry
More information about the checkins
mailing list