[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/app/component/ Made some deprecations more consistent with past.

[Jim Fulton]

Log message for revision 67563:
  Made some deprecations more consistent with past.
  

Changed:
  U   Zope3/branches/jim-adapter/src/zope/app/component/adapter.py
  U   Zope3/branches/jim-adapter/src/zope/app/component/site.py

-=-
Modified: Zope3/branches/jim-adapter/src/zope/app/component/adapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/adapter.py	2006-04-24 10:35:52 UTC (rev 67562)
+++ Zope3/branches/jim-adapter/src/zope/app/component/adapter.py	2006-04-24 10:36:19 UTC (rev 67563)
@@ -15,20 +15,11 @@
 
 import zope.deferredimport
 
-zope.deferredimport.deprecatedFrom(
-    "Local registration is now much simpler.  The old baroque APIs "
-    "will go away in Zope 3.5.  See the new component-registration APIs "
-    "defined in zope.component, especially IComponentRegistry.",
-    'zope.app.component.back35',
-    'LocalAdapterRegistry',
-    'LocalUtilityRegistry',
-    'UtilityRegistration',
-    )
-
 zope.deferredimport.deprecated(
     "Local registration is now much simpler.  The old baroque APIs "
     "will go away in Zope 3.5.  See the new component-registration APIs "
     "defined in zope.component, especially IComponentRegistry.",
-    AdapterRegistration = 'zope.app.component.back35.AdapterRegistration2'
+    LocalAdapterRegistry = 'zope.app.component.back35.AdapterRegistry',
+    AdapterRegistration = 'zope.app.component.back35.AdapterRegistration2',
     )
 

Modified: Zope3/branches/jim-adapter/src/zope/app/component/site.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/component/site.py	2006-04-24 10:35:52 UTC (rev 67562)
+++ Zope3/branches/jim-adapter/src/zope/app/component/site.py	2006-04-24 10:36:19 UTC (rev 67563)
@@ -359,7 +359,8 @@
     "will go away in Zope 3.5.  See the new component-registration APIs "
     "defined in zope.component, especially IComponentRegistry.",
     'zope.app.component.back35',
-    'LocalAdapterRegistry', 'LocalUtilityRegistry', 'UtilityRegistration',
+    'LocalAdapterRegistry', 'AdapterRegistration',
+    'LocalUtilityRegistry', 'UtilityRegistration',
     )
 
 def threadSiteSubscriber(ob, event):