[Checkins] SVN: zope.app.component/trunk/ Replaced the dependency on zope.deferredimport with BBB imports

[Gediminas Paulauskas]

Log message for revision 115381:
  Replaced the dependency on zope.deferredimport with BBB imports
  

Changed:
  U   zope.app.component/trunk/CHANGES.txt
  U   zope.app.component/trunk/setup.py
  U   zope.app.component/trunk/src/zope/app/component/contentdirective.py
  U   zope.app.component/trunk/src/zope/app/component/interfaces/__init__.py
  U   zope.app.component/trunk/src/zope/app/component/metadirectives.py

-=-
Modified: zope.app.component/trunk/CHANGES.txt
===================================================================
--- zope.app.component/trunk/CHANGES.txt	2010-08-02 17:46:44 UTC (rev 115380)
+++ zope.app.component/trunk/CHANGES.txt	2010-08-02 19:04:55 UTC (rev 115381)
@@ -8,7 +8,9 @@
 - No longer using deprected ``zope.testing.doctest``. Use python's build-in
   ``doctest`` instead.
 
+- Replaced the dependency on zope.deferredimport with BBB imports
 
+
 3.9.0 (2010-07-19)
 ------------------
 

Modified: zope.app.component/trunk/setup.py
===================================================================
--- zope.app.component/trunk/setup.py	2010-08-02 17:46:44 UTC (rev 115380)
+++ zope.app.component/trunk/setup.py	2010-08-02 19:04:55 UTC (rev 115381)
@@ -69,7 +69,6 @@
           'zope.cachedescriptors',
           'zope.component [hook,zcml] >= 3.8',
           'zope.configuration',
-          'zope.deferredimport',
           'zope.deprecation',
           'zope.event',
           'zope.exceptions',

Modified: zope.app.component/trunk/src/zope/app/component/contentdirective.py
===================================================================
--- zope.app.component/trunk/src/zope/app/component/contentdirective.py	2010-08-02 17:46:44 UTC (rev 115380)
+++ zope.app.component/trunk/src/zope/app/component/contentdirective.py	2010-08-02 19:04:55 UTC (rev 115381)
@@ -13,16 +13,7 @@
 ##############################################################################
 """Backwards compatibility: moved this module to
 `zope.security.metaconfigure`.
-
-$Id$
 """
-__docformat__ = 'restructuredtext'
 
-import zope.deferredimport
-
-zope.deferredimport.deprecated(
-    "The ``class`` directive implementation was moved to "
-    "zope.security.metaconfigure. This import will stop "
-    "working in Zope 3.6",
-    ClassDirective = 'zope.security.metaconfigure:ClassDirective'
-    )
+# BBB
+from zope.security.metaconfigure import ClassDirective

Modified: zope.app.component/trunk/src/zope/app/component/interfaces/__init__.py
===================================================================
--- zope.app.component/trunk/src/zope/app/component/interfaces/__init__.py	2010-08-02 17:46:44 UTC (rev 115380)
+++ zope.app.component/trunk/src/zope/app/component/interfaces/__init__.py	2010-08-02 19:04:55 UTC (rev 115381)
@@ -11,20 +11,13 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""Backwards compatibility module.
 
-The real interfaces are defined in zope.site.interfaces.
-$Id$
-"""
-
-import zope.deferredimport
-
+# BBB
 from zope.site.interfaces import (INewLocalSite,
                                   NewLocalSite,
                                   ILocalSiteManager,
                                   ISiteManagementFolder)
 
-zope.deferredimport.deprecatedFrom(
-    "Moved to zope.component.interfaces. Importing from here will stop working in Zope 3.6",
-    "zope.component.interfaces",
-    "ISite", "IPossibleSite")
+# BBB
+from zope.component.interfaces import (ISite,
+                                       IPossibleSite)

Modified: zope.app.component/trunk/src/zope/app/component/metadirectives.py
===================================================================
--- zope.app.component/trunk/src/zope/app/component/metadirectives.py	2010-08-02 17:46:44 UTC (rev 115380)
+++ zope.app.component/trunk/src/zope/app/component/metadirectives.py	2010-08-02 19:04:55 UTC (rev 115381)
@@ -12,24 +12,13 @@
 #
 ##############################################################################
 
-import zope.deferredimport
-import zope.security
-
 # BBB
-zope.deferredimport.deprecatedFrom(
-    "Schemas for the ``class`` directive and its subdirectives are now "
-    "moved to zope.security.metadirectives. Imports from here are "
-    "deprecated and will be removed in Zope 3.6",
+from zope.security.metadirectives import (IClassDirective,
+                                          IImplementsSubdirective,
+                                          IRequireSubdirective,
+                                          IAllowSubdirective,
+                                          IFactorySubdirective)
 
-    'zope.security.metadirectives',
-
-    'IClassDirective',
-    'IImplementsSubdirective',
-    'IRequireSubdirective',
-    'IAllowSubdirective',
-    'IFactorySubdirective',
-)
-
 # BBB
 from zope.component.zcml import (IBasicViewInformation,
                                  IBasicResourceInformation,