[Checkins] SVN: zope.app.publication/trunk/s Use zope.deprecation instead of zope.deferredimport

[Shane Hathaway]

Log message for revision 100294:
  Use zope.deprecation instead of zope.deferredimport
  

Changed:
  U   zope.app.publication/trunk/setup.py
  U   zope.app.publication/trunk/src/zope/app/publication/browser.py
  U   zope.app.publication/trunk/src/zope/app/publication/http.py
  U   zope.app.publication/trunk/src/zope/app/publication/publicationtraverse.py

-=-
Modified: zope.app.publication/trunk/setup.py
===================================================================
--- zope.app.publication/trunk/setup.py	2009-05-23 20:23:34 UTC (rev 100293)
+++ zope.app.publication/trunk/setup.py	2009-05-23 21:06:18 UTC (rev 100294)
@@ -63,7 +63,7 @@
                       'ZODB3',
                       'zope.authentication',
                       'zope.component',
-                      'zope.deferredimport',
+                      'zope.deprecation',
                       'zope.error',
                       'zope.i18n',
                       'zope.browser>=1.2',

Modified: zope.app.publication/trunk/src/zope/app/publication/browser.py
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/browser.py	2009-05-23 20:23:34 UTC (rev 100293)
+++ zope.app.publication/trunk/src/zope/app/publication/browser.py	2009-05-23 21:06:18 UTC (rev 100294)
@@ -26,15 +26,11 @@
 
 from zope.app.publication.http import BaseHTTPPublication
 
-import zope.deferredimport
+from zope.traversing.publicationtraverse import PublicationTraverser
+from zope.deprecation import deprecated
+deprecated("PublicationTraverser",
+    "moved to zope.traversing.publicationtraverse")
 
-zope.deferredimport.deprecatedFrom(
-    "This import has moved to zope.traversing.publicationtraverse. "
-    "This import will stop working in the future.",
-    'zope.traversing.publicationtraverse',
-    'PublicationTraverser',
-    )
-
 class BrowserPublication(BaseHTTPPublication):
     """Web browser publication handling."""
 

Modified: zope.app.publication/trunk/src/zope/app/publication/http.py
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/http.py	2009-05-23 20:23:34 UTC (rev 100293)
+++ zope.app.publication/trunk/src/zope/app/publication/http.py	2009-05-23 21:06:18 UTC (rev 100294)
@@ -24,16 +24,13 @@
 from zope.publisher.interfaces.http import MethodNotAllowed
 from zope.publisher.publish import mapply
 import zope.component
-import zope.deferredimport
 
 from zope.app.publication.zopepublication import ZopePublication
 
-zope.deferredimport.deprecatedFrom(
-    "This import has moved to zope.publisher.interfaces.http. "
-    "This import will stop working in the future.",
-    'zope.publisher.interfaces.http',
-    'IMethodNotAllowed',
-    )
+from zope.publisher.interfaces.http import IMethodNotAllowed
+from zope.deprecation import deprecated
+deprecated(
+    "IMethodNotAllowed", "moved to zope.publisher.interfaces")
 
 
 class BaseHTTPPublication(ZopePublication):

Modified: zope.app.publication/trunk/src/zope/app/publication/publicationtraverse.py
===================================================================
--- zope.app.publication/trunk/src/zope/app/publication/publicationtraverse.py	2009-05-23 20:23:34 UTC (rev 100293)
+++ zope.app.publication/trunk/src/zope/app/publication/publicationtraverse.py	2009-05-23 21:06:18 UTC (rev 100294)
@@ -18,16 +18,9 @@
 """
 __docformat__ = 'restructuredtext'
 
-import zope.deferredimport
+from zope.deprecation import moved
+moved('zope.traversing.publicationtraverse')
 
-zope.deferredimport.deprecatedFrom(
-    "This module has moved to zope.traversing. This import will stop "
-    "working in the future.",
-    'zope.traversing.publicationtraverse',
-    'PublicationTraverse',
-    'PublicationTraverser',
-    )
-
 # AFAICT, no one depends on the exception types defined below,
 # nor should they!  - 2009-05-23