[Zope-Checkins] SVN: Zope/trunk/s Use zope.deferredimport instead of zope.deprecated for deprecations. Yay.

[Matthew Wilkes]

Log message for revision 113981:
  Use zope.deferredimport instead of zope.deprecated for deprecations.  Yay.

Changed:
  U   Zope/trunk/setup.py
  U   Zope/trunk/src/Products/MailHost/mailer.py

-=-
Modified: Zope/trunk/setup.py
===================================================================
--- Zope/trunk/setup.py	2010-06-29 16:05:17 UTC (rev 113980)
+++ Zope/trunk/setup.py	2010-06-29 16:27:57 UTC (rev 113981)
@@ -56,7 +56,6 @@
       'zope.browsermenu',
       'zope.browserpage',
       'zope.browserresource',
-      'zope.deprecation',
       'zope.component',
       'zope.configuration',
       'zope.container',

Modified: Zope/trunk/src/Products/MailHost/mailer.py
===================================================================
--- Zope/trunk/src/Products/MailHost/mailer.py	2010-06-29 16:05:17 UTC (rev 113980)
+++ Zope/trunk/src/Products/MailHost/mailer.py	2010-06-29 16:27:57 UTC (rev 113981)
@@ -1,2 +1,7 @@
-import zope.deprecation
-zope.deprecation.moved('zope.sendmail.mailer', 'Zope 2.14')
\ No newline at end of file
+import zope.deferredimport
+
+zope.deferredimport.deprecatedFrom(
+    "Import from zope.sendmail instead",
+    'zope.sendmail.mailer',
+    'SMTPMailer',
+    )