[Checkins] SVN: five.localsitemanager/trunk/ Rewrite PersistentComponents.registeredUtilities to not use internal methods.

[Wichert Akkerman]

Log message for revision 88757:
  Rewrite PersistentComponents.registeredUtilities to not use internal methods.
  This makes it compatible with both zope.component <3.5.0dev and >3.5.0dev
  

Changed:
  U   five.localsitemanager/trunk/CHANGES.txt
  U   five.localsitemanager/trunk/src/five/localsitemanager/registry.py

-=-
Modified: five.localsitemanager/trunk/CHANGES.txt
===================================================================
--- five.localsitemanager/trunk/CHANGES.txt	2008-07-23 10:38:29 UTC (rev 88756)
+++ five.localsitemanager/trunk/CHANGES.txt	2008-07-23 11:08:37 UTC (rev 88757)
@@ -2,6 +2,14 @@
 CHANGES
 =======
 
+0.3 - Unreleased
+================
+
+* Rewrite PersistentComponents.registeredUtilities to not use
+  internal methods. This makes it compatible with both zope.component <3.5.0dev
+  and >3.5.0dev.
+
+
 five.localsitemanager 0.3 (2007-12-24)
 ======================================
 

Modified: five.localsitemanager/trunk/src/five/localsitemanager/registry.py
===================================================================
--- five.localsitemanager/trunk/src/five/localsitemanager/registry.py	2008-07-23 10:38:29 UTC (rev 88756)
+++ five.localsitemanager/trunk/src/five/localsitemanager/registry.py	2008-07-23 11:08:37 UTC (rev 88757)
@@ -173,7 +173,7 @@
         utilities.__parent__ = self
 
     def registeredUtilities(self):
-        for ((provided, name), (component, info)
-             ) in self._utility_registrations.iteritems():
-            yield UtilityRegistration(self, provided, name,
-                                      _wrap(component, self), info)
+        for reg in super(PersistentComponents, self).registeredUtilities():
+            reg.component=_wrap(reg.component, self)
+            yield reg
+