Merge pull request #20 from ZeitOnline/adapter-discriminator

Adjust discriminator for adapters so it matches the one used by zope.component

CHANGES.rst

@@ -4,7 +4,10 @@ Changes
 4.2 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Adjust discriminator for adapters so it matches the one used by the
+  ``zope.component`` ZCML directive (``<adapter factory=""/>``) and thus a
+  conflict error is raised if there are two registrations for the same
+  discriminator.
 
 
 4.1 (2023-03-21)

src/grokcore/component/meta.py

@@ -45,10 +45,11 @@ class AdapterGrokker(martian.ClassGrokker):
     martian.directive(grokcore.component.name)
 
     def execute(self, factory, config, context, provides, name, **kw):
+        for_ = (context,)
         config.action(
-            discriminator=('adapter', context, provides, name),
+            discriminator=('adapter', for_, provides, name),
             callable=grokcore.component.provideAdapter,
-            args=(factory, (context,), provides, name),
+            args=(factory, for_, provides, name),
         )
         return True
 

src/grokcore/component/tests/__init__.py

@@ -1 +0,0 @@
-# make this directory a package

src/grokcore/component/tests/adapter/__init__.py

@@ -1 +0,0 @@
-# this is a package

src/grokcore/component/tests/directive/__init__.py

@@ -1 +0,0 @@
-# this is a package

src/grokcore/component/tests/event/__init__.py

@@ -1 +0,0 @@
-# this is a package

src/grokcore/component/tests/grokker/onlyonce_fixture/__init__.py

@@ -1 +0,0 @@
-# fixture package

src/grokcore/component/tests/inherit/__init__.py

@@ -1 +0,0 @@
-#

src/grokcore/component/tests/order/__init__.py

@@ -1 +0,0 @@
-#

src/grokcore/component/tests/subscriptions/__init__.py

@@ -1 +0,0 @@
-# this is a package

src/grokcore/component/tests/utility/__init__.py

@@ -1 +0,0 @@
-# this is a package

src/grokcore/component/tests/view/__init__.py

@@ -1 +0,0 @@
-# this is a package

src/grokcore/component/tests/zcml/__init__.py

@@ -1 +0,0 @@
-# this is a package

src/grokcore/component/tests/zcml/conflict.py

@@ -0,0 +1,26 @@
+"""
+It raises ConflictError if ZCML and grok try to register an adapter from/to
+the same classes.
+
+>>> xmlconfig.string('''
+...     <configure
+...         xmlns="http://namespaces.zope.org/zope"
+...         xmlns:grok="http://namespaces.zope.org/grok">
+...       <include package="zope.component" file="meta.zcml"/>
+...       <include package="grokcore.component" file="meta.zcml"/>
+...       <adapter factory=".fixture.ZCMLHome" />
+...       <grok:grok package="." />
+...     </configure>''', context)
+Traceback (most recent call last):
+ConfigurationConflictError: ...
+
+"""
+
+from zope.configuration import xmlconfig
+
+from grokcore.component.tests.zcml import conflictpkg
+
+
+context = xmlconfig.ConfigurationMachine()
+xmlconfig.registerCommonDirectives(context)
+context.package = conflictpkg

src/grokcore/component/tests/zcml/conflictpkg/fixture.py

@@ -0,0 +1,23 @@
+from zope import component
+from zope import interface
+
+import grokcore.component as grok
+
+
+class Cave(grok.Context):
+    pass
+
+
+class IHome(interface.Interface):
+    pass
+
+
+@grok.implementer(IHome)
+class GrokHome(grok.Adapter):
+    pass
+
+
+@component.adapter(Cave)
+@interface.implementer(IHome)
+class ZCMLHome:
+    pass

src/grokcore/component/tests/zcml/excludemanypkg/__init__.py

@@ -1 +0,0 @@
-# this is a package

src/grokcore/component/tests/zcml/excludepkg/__init__.py

@@ -1 +0,0 @@
-# this is a package