[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/component/globalregistry.py Fixed the backward-compatible subscription registration.

Jim Fulton jim at zope.com
Tue Feb 28 18:47:29 EST 2006


Log message for revision 65626:
  Fixed the backward-compatible subscription registration.
  

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

-=-
Modified: Zope3/branches/jim-adapter/src/zope/component/globalregistry.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/component/globalregistry.py	2006-02-28 23:45:59 UTC (rev 65625)
+++ Zope3/branches/jim-adapter/src/zope/component/globalregistry.py	2006-02-28 23:47:29 UTC (rev 65626)
@@ -117,7 +117,11 @@
     def subscribe(self, required, provided, factory, info=''):
         # we're discarding 'provided' here, but a subscriber doesn't
         # need that anyway
-        self.registerHandler(factory, required, u'', info)
+        if provided is None:
+            self.registerHandler(factory, required, u'', info)
+        else:
+            self.registerSubscriptionAdapter(factory, required, provided,
+                                             info=info)
 
     @deprecate("The provideUtility method of the global site manager has been "
                "deprecated. Use registerUtility instead.")



More information about the Zope3-Checkins mailing list