Merge pull request #137 from plone/maurits/zope-component-5

Fixed incompatibility with zope.component 5.
plone · Jul 2, 2021 · 935e6c1 · 935e6c1
2 parents 4c07248 + 4b64d01
commit 935e6c1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/Products/Archetypes/event.py b/Products/Archetypes/event.py
@@ -3,7 +3,7 @@
 
 from zope.interface import implementer
 
-from zope.component.interfaces import ObjectEvent
+from zope.interface.interfaces import ObjectEvent
 from zope.lifecycleevent import ObjectModifiedEvent
 
 from Products.Archetypes.interfaces import IObjectInitializedEvent

diff --git a/Products/Archetypes/interfaces/event.py b/Products/Archetypes/interfaces/event.py
@@ -1,7 +1,7 @@
 """Event-related interfaces
 """
 
-from zope.component.interfaces import IObjectEvent
+from zope.interface.interfaces import IObjectEvent
 from zope.lifecycleevent.interfaces import IObjectModifiedEvent
 
 # Modification

diff --git a/Products/Archetypes/mimetype_utils.py b/Products/Archetypes/mimetype_utils.py
@@ -6,7 +6,7 @@
     from Products.CMFPlone.interfaces import IMarkupSchema
     from plone.registry.interfaces import IRegistry
     from zope.component import getUtility
-    from zope.component.interfaces import ComponentLookupError
+    from zope.interface.interfaces import ComponentLookupError
 except ImportError:
     IMarkupSchema = None
 

diff --git a/Products/Archetypes/tests/events.txt b/Products/Archetypes/tests/events.txt
@@ -9,7 +9,7 @@ that listens for object events for `IBaseObject`:
   >>> from StringIO import StringIO
   >>> from Products.Archetypes.tests.utils import makeContent, aputrequest
   >>> from Products.Archetypes.interfaces import IBaseObject
-  >>> from zope.component.interfaces import IObjectEvent
+  >>> from zope.interface.interfaces import IObjectEvent
 
   >>> class Handler:
   ...     def __init__(self):

diff --git a/news/462.bugfix b/news/462.bugfix
@@ -0,0 +1,3 @@
+Fixed incompatibility with ``zope.component`` 5.
+``zope.component.interfaces`` has long been a backwards compatibility import for ``zope.interface.interfaces``, but not anymore.
+[maurits]