[Zope-Checkins] SVN: Products.Five/trunk/ Use new import locations of some zope 3 packages

[Philipp von Weitershausen]

Log message for revision 67826:
  Use new import locations of some zope 3 packages
  

Changed:
  U   Products.Five/trunk/browser/TrustedExpression.py
  U   Products.Five/trunk/viewlet/README.txt
  U   Products.Five/trunk/viewlet/directives.txt
  U   Products.Five/trunk/viewlet/metaconfigure.py
  U   Products.Five/trunk/viewlet/tests.py

-=-
Modified: Products.Five/trunk/browser/TrustedExpression.py
===================================================================
--- Products.Five/trunk/browser/TrustedExpression.py	2006-05-02 10:14:24 UTC (rev 67825)
+++ Products.Five/trunk/browser/TrustedExpression.py	2006-05-02 10:27:58 UTC (rev 67826)
@@ -30,9 +30,8 @@
 
 from zope.publisher.interfaces.browser import IBrowserRequest
 from zope.interface import implements, Interface
-from zope.app.publication.browser import setDefaultSkin
-from zope.app.traversing.namespace import nsParse
-from zope.app.traversing.namespace import namespaceLookup
+from zope.publisher.browser import setDefaultSkin
+from zope.traversing.namespace import nsParse, namespaceLookup
 from zope.component import queryMultiAdapter
 
 class FakeRequest(dict):

Modified: Products.Five/trunk/viewlet/README.txt
===================================================================
--- Products.Five/trunk/viewlet/README.txt	2006-05-02 10:14:24 UTC (rev 67825)
+++ Products.Five/trunk/viewlet/README.txt	2006-05-02 10:27:58 UTC (rev 67826)
@@ -71,7 +71,7 @@
 
   >>> from Products.Five.traversable import FakeRequest
   >>> request = FakeRequest()
-  >>> from zope.app.publication.browser import setDefaultSkin
+  >>> from zope.publisher.browser import setDefaultSkin
   >>> setDefaultSkin(request)
 
   >>> from Products.Five.browser import BrowserView as View
@@ -89,7 +89,7 @@
 
   >>> import zope.component
   >>> from zope.publisher.interfaces.browser import IDefaultBrowserLayer
-  >>> from zope.app.publisher.interfaces.browser import IBrowserView
+  >>> from zope.publisher.interfaces.browser import IBrowserView
 
   >>> from Acquisition import Explicit
   >>> class WeatherBox(Explicit):

Modified: Products.Five/trunk/viewlet/directives.txt
===================================================================
--- Products.Five/trunk/viewlet/directives.txt	2006-05-02 10:14:24 UTC (rev 67825)
+++ Products.Five/trunk/viewlet/directives.txt	2006-05-02 10:27:58 UTC (rev 67826)
@@ -42,7 +42,7 @@
 
   >>> from Products.Five.traversable import FakeRequest
   >>> request = FakeRequest()
-  >>> from zope.app.publication.browser import setDefaultSkin
+  >>> from zope.publisher.browser import setDefaultSkin
   >>> setDefaultSkin(request)
 
   >>> from Products.Five.browser import BrowserView as View

Modified: Products.Five/trunk/viewlet/metaconfigure.py
===================================================================
--- Products.Five/trunk/viewlet/metaconfigure.py	2006-05-02 10:14:24 UTC (rev 67825)
+++ Products.Five/trunk/viewlet/metaconfigure.py	2006-05-02 10:27:58 UTC (rev 67826)
@@ -1,12 +1,11 @@
 import os
 from zope.configuration.exceptions import ConfigurationError
 from zope.viewlet import interfaces
-from zope.interface import Interface
-from zope.interface import classImplements
+from zope.interface import Interface, classImplements
+from zope.component import zcml
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
-from zope.app.component import metaconfigure
+from zope.publisher.interfaces.browser import IBrowserView
 from zope.app.publisher.browser import viewmeta
-from zope.app.publisher.interfaces.browser import IBrowserView
 
 from Products.Five.security import getSecurityInfo, protectClass, protectName
 import viewlet
@@ -49,15 +48,15 @@
 
     # Register interfaces
     viewmeta._handle_for(_context, for_)
-    metaconfigure.interface(_context, view)
+    zcml.interface(_context, view)
 
     # register a viewlet manager
     _context.action(
         discriminator = ('viewletManager', for_, layer, view, name),
-        callable = metaconfigure.handler,
-        args = ('provideAdapter',
-                (for_, layer, view), provides, name,
-                 new_class, _context.info),)
+        callable = zcml.handler,
+        args = ('registerAdapter',
+                new_class, (for_, layer, view), provides, name,
+                _context.info),)
     _context.action(
         discriminator = ('five:protectClass', new_class),
         callable = protectClass,
@@ -148,12 +147,12 @@
 
     # Register the interfaces.
     viewmeta._handle_for(_context, for_)
-    metaconfigure.interface(_context, view)
+    zcml.interface(_context, view)
 
     # register viewlet
     _context.action(
         discriminator = ('viewlet', for_, layer, view, manager, name),
-        callable = metaconfigure.handler,
+        callable = zcml.handler,
         args = ('provideAdapter',
                 (for_, layer, view, manager), interfaces.IViewlet,
                  name, new_class, _context.info),)
@@ -174,4 +173,4 @@
         discriminator = ('five:initialize:class', new_class),
         callable = initializeClass,
         args = (new_class,)
-        )
\ No newline at end of file
+        )

Modified: Products.Five/trunk/viewlet/tests.py
===================================================================
--- Products.Five/trunk/viewlet/tests.py	2006-05-02 10:14:24 UTC (rev 67825)
+++ Products.Five/trunk/viewlet/tests.py	2006-05-02 10:27:58 UTC (rev 67826)
@@ -23,10 +23,9 @@
 from zope.component import provideAdapter
 from zope.interface import Interface
 from zope.interface import implements
-from zope.app.traversing.adapters import Traverser
-from zope.app.traversing.interfaces import ITraversable
-from zope.app.traversing.interfaces import ITraverser
-from zope.app.traversing.namespace import resource
+from zope.traversing.interfaces import ITraversable, ITraverser
+from zope.traversing.adapters import Traverser
+from zope.traversing.namespace import resource
 from zope.viewlet import interfaces
 from OFS.SimpleItem import SimpleItem
 
@@ -88,8 +87,8 @@
     setup.placefulSetUp()
 
 #    # resource namespace setup
-#    from zope.app.traversing.interfaces import ITraversable
-#    from zope.app.traversing.namespace import resource
+#    from zope.traversing.interfaces import ITraversable
+#    from zope.traversing.namespace import resource
 #    ztapi.provideAdapter(None, ITraversable, resource, name="resource")
 #    ztapi.provideView(None, None, ITraversable, "resource", resource)
 #