Add compatibility with ZODB3 3.10 by importing the IBroken interface from it...

Add compatibility with ZODB3 3.10 by importing the IBroken interface from it directly. Once we can rely on the new ZODB3 version exclusively, we can remove the dependency onto the zope.broken distribution.

CHANGES.txt

@@ -5,6 +5,9 @@ CHANGES
 3.11.1 (unreleased)
 -------------------
 
+- Added compatibility with ZODB3 3.10 by importing the IBroken interface from
+  it directly. Once we can rely on the new ZODB3 version exclusively, we can
+  remove the dependency onto the zope.broken distribution.
 
 3.11.0 (2009-12-31)
 -------------------

src/zope/container/contained.py

@@ -39,7 +39,12 @@ from zope.lifecycleevent import ObjectMovedEvent
 from zope.lifecycleevent import ObjectAddedEvent
 from zope.lifecycleevent import ObjectRemovedEvent
 
-from zope.broken.interfaces import IBroken
+# BBB ZODB3 < 3.10
+try:
+    from ZODB.interfaces import IBroken
+except ImportError:
+    from zope.broken.interfaces import IBroken
+
 
 class Contained(object):
     """Stupid mix-in that defines `__parent__` and `__name__` attributes"""