[Checkins] SVN: zope.app.publisher/trunk/s use zope.deprecation instead of zope.deferredimport

[Shane Hathaway]

Log message for revision 100295:
  use zope.deprecation instead of zope.deferredimport
  

Changed:
  U   zope.app.publisher/trunk/setup.py
  U   zope.app.publisher/trunk/src/zope/app/publisher/browser/__init__.py

-=-
Modified: zope.app.publisher/trunk/setup.py
===================================================================
--- zope.app.publisher/trunk/setup.py	2009-05-23 21:06:18 UTC (rev 100294)
+++ zope.app.publisher/trunk/setup.py	2009-05-23 21:09:34 UTC (rev 100295)
@@ -47,7 +47,7 @@
                         'zope.container',
                         'zope.contenttype',
                         'zope.datetime',
-                        'zope.deferredimport',
+                        'zope.deprecation',
                         'zope.i18n',
                         'zope.interface',
                         'zope.location',

Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/__init__.py
===================================================================
--- zope.app.publisher/trunk/src/zope/app/publisher/browser/__init__.py	2009-05-23 21:06:18 UTC (rev 100294)
+++ zope.app.publisher/trunk/src/zope/app/publisher/browser/__init__.py	2009-05-23 21:09:34 UTC (rev 100295)
@@ -21,16 +21,14 @@
 from zope.i18n.interfaces import IUserPreferredLanguages
 from zope.i18n.interfaces import IModifiableUserPreferredLanguages
 
-import zope.deferredimport
+from zope.deprecation import deprecated
+from zope.publisher.defaultview import IDefaultViewNameAPI
+from zope.publisher.defaultview import getDefaultViewName
+from zope.publisher.defaultview import queryDefaultViewName
+deprecated(
+    ['IDefaultViewNameAPI', 'getDefaultViewName', 'queryDefaultViewName'],
+    "moved to zope.publisher.defaultview")
 
-zope.deferredimport.deprecatedFrom(
-    "This import has moved to zope.publisher.defaultview. "
-    "This import will stop working in the future.",
-    'zope.publisher.defaultview',
-    'IDefaultViewNameAPI',
-    'getDefaultViewName',
-    'queryDefaultViewName',
-    )
 
 class NotCompatibleAdapterError(Exception):
     """Adapter not compatible with