[z3-checkins] r28501 - in z3/z3reload/trunk: . ftests

[gintas at codespeak.net]

Author: gintas
Date: Thu Jun  8 10:15:59 2006
New Revision: 28501

Modified:
   z3/z3reload/trunk/ftests/dynamic.py
   z3/z3reload/trunk/ftests/dynamic_orig.py
   z3/z3reload/trunk/ftests/ftesting.zcml
   z3/z3reload/trunk/subscriber.py
Log:
Fixed deprecation warnings.


Modified: z3/z3reload/trunk/ftests/dynamic.py
==============================================================================
--- z3/z3reload/trunk/ftests/dynamic.py	(original)
+++ z3/z3reload/trunk/ftests/dynamic.py	Thu Jun  8 10:15:59 2006
@@ -1,4 +1,4 @@
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 
 
 class SomeNumberView(BrowserView):

Modified: z3/z3reload/trunk/ftests/dynamic_orig.py
==============================================================================
--- z3/z3reload/trunk/ftests/dynamic_orig.py	(original)
+++ z3/z3reload/trunk/ftests/dynamic_orig.py	Thu Jun  8 10:15:59 2006
@@ -1,4 +1,4 @@
-from zope.app.publisher.browser import BrowserView
+from zope.publisher.browser import BrowserView
 
 
 class SomeNumberView(BrowserView):

Modified: z3/z3reload/trunk/ftests/ftesting.zcml
==============================================================================
--- z3/z3reload/trunk/ftests/ftesting.zcml	(original)
+++ z3/z3reload/trunk/ftests/ftesting.zcml	Thu Jun  8 10:15:59 2006
@@ -3,19 +3,19 @@
 
   <reload:reload modules="z3reload.ftests.dynamic" />
 
-  <page for="zope.app.traversing.interfaces.IContainmentRoot"
+  <page for="zope.traversing.interfaces.IContainmentRoot"
         name="some.html"
         class=".dynamic.SomeNumberView"
         template="dynamic.pt"
         permission="zope.Public" />
 
-  <page for="zope.app.traversing.interfaces.IContainmentRoot"
+  <page for="zope.traversing.interfaces.IContainmentRoot"
         name="another.html"
         class=".dynamic.AnotherNumberView"
         template="dynamic.pt"
         permission="zope.Public" />
 
-  <page for="zope.app.traversing.interfaces.IContainmentRoot"
+  <page for="zope.traversing.interfaces.IContainmentRoot"
         name="third.txt"
         class=".dynamic.ThirdNumberView"
         permission="zope.Public" />

Modified: z3/z3reload/trunk/subscriber.py
==============================================================================
--- z3/z3reload/trunk/subscriber.py	(original)
+++ z3/z3reload/trunk/subscriber.py	Thu Jun  8 10:15:59 2006
@@ -2,7 +2,7 @@
 
 from zope.component import getGlobalSiteManager
 from zope.publisher.interfaces import IRequest
-from zope.component.site import AdapterRegistration
+from zope.component.registry import AdapterRegistration
 
 from z3reload.reload import install_reloader, simple_view_classes
 from z3reload.metaconfigure import enabled_classes, enabled_modules
@@ -22,8 +22,8 @@
             reg.required[-1].isOrExtends(IRequest)):
         return False # this registration does not appear to be a view
 
-    return (type(reg.value) == type and
-            issubclass(reg.value, simple_view_classes))
+    return (type(reg.factory) == type and
+            issubclass(reg.factory, simple_view_classes))
 
 
 def reload_enabled_for(view_class):
@@ -47,6 +47,6 @@
     Hooks on the DatabaseOpened event.
     """
     gsm = getGlobalSiteManager()
-    for reg in gsm.registrations():
-        if is_simple_view(reg) and reload_enabled_for(reg.value):
-            install_reloader(reg.value)
+    for reg in gsm.registeredAdapters():
+        if is_simple_view(reg) and reload_enabled_for(reg.factory):
+            install_reloader(reg.factory)