[Checkins] SVN: zope.app.error/trunk/ Replaced the use of zope.deferredimport with direct imports.

[Gediminas Paulauskas]

Log message for revision 116089:
  Replaced the use of zope.deferredimport with direct imports.
  

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

-=-
Modified: zope.app.error/trunk/CHANGES.txt
===================================================================
--- zope.app.error/trunk/CHANGES.txt	2010-09-01 13:37:52 UTC (rev 116088)
+++ zope.app.error/trunk/CHANGES.txt	2010-09-01 13:44:34 UTC (rev 116089)
@@ -6,7 +6,9 @@
 ------------------
 
 - Removed the dependency on zope.app.publisher, added missing dependencies.
+- Replaced the use of zope.deferredimport with direct imports.
 
+
 3.5.2 (2009-01-22)
 ------------------
 
@@ -24,6 +26,7 @@
 
 - Fix package's README.txt
 
+
 3.5.1 (2007-09-27)
 ------------------
 

Modified: zope.app.error/trunk/setup.py
===================================================================
--- zope.app.error/trunk/setup.py	2010-09-01 13:37:52 UTC (rev 116088)
+++ zope.app.error/trunk/setup.py	2010-09-01 13:44:34 UTC (rev 116089)
@@ -58,8 +58,6 @@
     namespace_packages=['zope', 'zope.app'],
     install_requires=['setuptools',
                       'zope.component',
-                      'zope.deferredimport',
-                      'zope.deprecation',
                       'zope.error',
                       'zope.publisher',
                       'zope.traversing',

Modified: zope.app.error/trunk/src/zope/app/error/error.py
===================================================================
--- zope.app.error/trunk/src/zope/app/error/error.py	2010-09-01 13:37:52 UTC (rev 116088)
+++ zope.app.error/trunk/src/zope/app/error/error.py	2010-09-01 13:44:34 UTC (rev 116089)
@@ -14,39 +14,11 @@
 """Error Reporting Utility
 
 This is a port of the Zope 2 error reporting object
-
-$Id$
 """
-__docformat__ = 'restructuredtext'
 
-import zope.deferredimport
-import zope.deprecation
-zope.deprecation.moved(
-    'zope.error.error',
-    "Zope 3.6",
-    )
-zope.deferredimport.deprecated(
-    "It has moved to zope.error.error  This reference will be gone "
-    "in Zope 3.6",
-    printedreplace = 'zope.error.error:printedreplace',
-    )
-zope.deferredimport.deprecated(
-    "It has moved to zope.error.error  This reference will be gone "
-    "in Zope 3.6",
-    getFormattedException = 'zope.error.error:getFormattedException',
-    )
-zope.deferredimport.deprecated(
-    "It has moved to zope.error.error  This reference will be gone "
-    "in Zope 3.6",
-    ErrorReportingUtility = 'zope.error.error:ErrorReportingUtility',
-    )
-zope.deferredimport.deprecated(
-    "It has moved to zope.error.error.  This reference will be gone "
-    "in Zope 3.6",
-    RootErrorReportingUtility = 'zope.error.error:RootErrorReportingUtility',
-    )
-zope.deferredimport.deprecated(
-    "It has moved to zope.error.error  This reference will be gone "
-    "in Zope 3.6",
-    globalErrorReportingUtility = 'zope.error.error:globalErrorReportingUtility',
-    )
+# BBB
+from zope.error.error import (printedreplace,
+                              getFormattedException,
+                              ErrorReportingUtility,
+                              RootErrorReportingUtility,
+                              globalErrorReportingUtility)

Modified: zope.app.error/trunk/src/zope/app/error/interfaces.py
===================================================================
--- zope.app.error/trunk/src/zope/app/error/interfaces.py	2010-09-01 13:37:52 UTC (rev 116088)
+++ zope.app.error/trunk/src/zope/app/error/interfaces.py	2010-09-01 13:44:34 UTC (rev 116089)
@@ -12,23 +12,8 @@
 #
 ##############################################################################
 """Error Reporting Utility interfaces
-
-$Id$
 """
-__docformat__ = 'restructuredtext'
-import zope.deferredimport
-import zope.deprecation
-zope.deprecation.moved(
-    'zope.error.error',
-    "Zope 3.6",
-    )
 
-zope.deferredimport.deprecated(
-    "IErrorReportingUtility has moved to zope.error.interfaces",
-    IErrorReportingUtility = 'zope.error.interfaces:IErrorReportingUtility',
-    )
-
-zope.deferredimport.deprecated(
-    "ILocalErrorReportingUtility has moved to zope.error.interfaces",
-    ILocalErrorReportingUtility = 'zope.error.interfaces:ILocalErrorReportingUtility',
-    )
+# BBB
+from zope.error.interfaces import (IErrorReportingUtility,
+                                   ILocalErrorReportingUtility)