[Checkins] SVN: zope.broken/trunk/ The IBroken interface has been merged into the ZODB3 distribution. Import the interface from there, while providing a copy for backwards compatibility with older versions of the ZODB3.

[Hanno Schlichting]

Log message for revision 107903:
  The IBroken interface has been merged into the ZODB3 distribution. Import the interface from there, while providing a copy for backwards compatibility with older versions of the ZODB3.
  

Changed:
  U   zope.broken/trunk/CHANGES.txt
  U   zope.broken/trunk/README.txt
  U   zope.broken/trunk/setup.py
  U   zope.broken/trunk/src/zope/broken/interfaces.py

-=-
Modified: zope.broken/trunk/CHANGES.txt
===================================================================
--- zope.broken/trunk/CHANGES.txt	2010-01-08 22:58:48 UTC (rev 107902)
+++ zope.broken/trunk/CHANGES.txt	2010-01-09 00:22:06 UTC (rev 107903)
@@ -1,7 +1,13 @@
-=====================
-zope.broken Changelog
-=====================
+Changelog
+=========
 
+3.6.0 (unreleased)
+------------------
+
+- The IBroken interface has been merged into the ZODB3 distribution. Import
+  the interface from there, while providing a copy for backwards compatibility
+  with older versions of the ZODB3.
+
 3.5.0 (2009-02-04)
 ------------------
 

Modified: zope.broken/trunk/README.txt
===================================================================
--- zope.broken/trunk/README.txt	2010-01-08 22:58:48 UTC (rev 107902)
+++ zope.broken/trunk/README.txt	2010-01-09 00:22:06 UTC (rev 107903)
@@ -1,12 +1,11 @@
-==================
-zope.broken README
-==================
+Overview
+========
 
-This package defines a marker interface, ``zope.broken.IBroken``, used
-to identify objects which cannot be correctly loaded from the ZODB,
-typically because the class named in their pickle is not importable.
+This package is obsolete and its functionality has been merged into the ZODB3
+distribution itself. If you use version 3.10 or later of ZODB3, please change
+your imports of the IBroken interface to a direct::
 
-The package exists as a dependency inversion, preventing packages which
-need to use this interface (e.g., ``zope.container``) from inheriting
-the dependencies of ``zope.app.broken`` (where the interface used to be
-defined).
+  from ZODB.interfaces import IBroken
+
+You can use this package with older versions of the ZODB3, which didn't have
+the IBroken interface yet.

Modified: zope.broken/trunk/setup.py
===================================================================
--- zope.broken/trunk/setup.py	2010-01-08 22:58:48 UTC (rev 107902)
+++ zope.broken/trunk/setup.py	2010-01-09 00:22:06 UTC (rev 107903)
@@ -22,9 +22,9 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.broken',
-      version = '3.5.0dev',
+      version = '3.6.0dev',
       author='Zope Corporation and Contributors',
-      author_email='zope3-dev at zope.org',
+      author_email='zope-dev at zope.org',
       description='Zope Broken Object Interfaces',
       long_description=(
           read('README.txt')
@@ -42,7 +42,7 @@
           'Operating System :: OS Independent',
           'Topic :: Internet :: WWW/HTTP',
           'Framework :: Zope3'],
-      url='http://cheeseshop.python.org/pypi/zope.broken',
+      url='http://pypi.python.org/pypi/zope.broken',
       license='ZPL 2.1',
       packages=find_packages('src'),
       package_dir = {'': 'src'},

Modified: zope.broken/trunk/src/zope/broken/interfaces.py
===================================================================
--- zope.broken/trunk/src/zope/broken/interfaces.py	2010-01-08 22:58:48 UTC (rev 107902)
+++ zope.broken/trunk/src/zope/broken/interfaces.py	2010-01-09 00:22:06 UTC (rev 107903)
@@ -11,7 +11,7 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""zope.app.broken interfaces.
+"""zope.broken interfaces.
 
 $Id: interfaces.py 72735 2007-02-21 05:02:33Z baijum $
 """
@@ -20,6 +20,9 @@
 
 import zope.interface
 
-class IBroken(zope.interface.Interface):
-    """Marker interface for broken objects
-    """
+try:
+    from ZODB.interfaces import IBroken
+except ImportError:
+    class IBroken(zope.interface.Interface):
+        """Marker interface for broken objects
+        """