[Checkins] SVN: zope.error/trunk/ Reduced the dependency on zope.container to one on zope.location by no

[Thomas Lotze]

Log message for revision 104587:
  Reduced the dependency on zope.container to one on zope.location by no
  longer using the Contained mix-in class.
  

Changed:
  U   zope.error/trunk/CHANGES.txt
  U   zope.error/trunk/setup.py
  U   zope.error/trunk/src/zope/error/error.py

-=-
Modified: zope.error/trunk/CHANGES.txt
===================================================================
--- zope.error/trunk/CHANGES.txt	2009-09-28 06:52:08 UTC (rev 104586)
+++ zope.error/trunk/CHANGES.txt	2009-09-28 08:07:29 UTC (rev 104587)
@@ -23,6 +23,9 @@
 - Use a mock request for testing. Dropped the dependency on zope.publisher
   which was really only a testing dependency.
 
+- Reduced the dependency on zope.container to one on zope.location by no
+  longer using the Contained mix-in class.
+
 3.6.0 (2009-01-31)
 ------------------
 

Modified: zope.error/trunk/setup.py
===================================================================
--- zope.error/trunk/setup.py	2009-09-28 06:52:08 UTC (rev 104586)
+++ zope.error/trunk/setup.py	2009-09-28 08:07:29 UTC (rev 104587)
@@ -55,9 +55,9 @@
 	package_dir = {'': 'src'},
     namespace_packages=['zope',],
     install_requires=['setuptools',
-                      'zope.container',
                       'zope.exceptions',
                       'zope.interface',
+                      'zope.location',
                       'ZODB3', # error.py imports from persistent
                       ],
     include_package_data = True,

Modified: zope.error/trunk/src/zope/error/error.py
===================================================================
--- zope.error/trunk/src/zope/error/error.py	2009-09-28 06:52:08 UTC (rev 104586)
+++ zope.error/trunk/src/zope/error/error.py	2009-09-28 08:07:29 UTC (rev 104587)
@@ -30,10 +30,10 @@
 from zope.exceptions.exceptionformatter import format_exception
 from zope.interface import implements
 
-from zope.container.contained import Contained
 from zope.error.interfaces import IErrorReportingUtility
 from zope.error.interfaces import ILocalErrorReportingUtility
 
+import zope.location.interfaces
 
 #Restrict the rate at which errors are sent to the Event Log
 _rate_restrict_pool = {}
@@ -89,10 +89,13 @@
         lines.append(line)
     return u"".join(lines)
 
-class ErrorReportingUtility(Persistent, Contained):
+class ErrorReportingUtility(Persistent):
     """Error Reporting Utility"""
-    implements(IErrorReportingUtility, ILocalErrorReportingUtility)
+    implements(IErrorReportingUtility, ILocalErrorReportingUtility,
+               zope.location.interfaces.IContained)
 
+    __parent__ = __name__ = None
+
     keep_entries = 20
     copy_to_zlog = 0
     _ignored_exceptions = ('Unauthorized',)