New import locations for zope.app.traversing

lib/python/OFS/Traversable.py

@@ -25,20 +25,17 @@ from AccessControl.ZopeGuards import guarded_getattr
 from Acquisition import Acquired, aq_inner, aq_parent, aq_base
 from zExceptions import NotFound
 from ZODB.POSException import ConflictError
-from zope.interface import implements, Interface
+from OFS.interfaces import ITraversable
 
-from interfaces import ITraversable
-from zope.app.traversing.interfaces import ITraversable as IZope3Traversable
+from zope.interface import implements, Interface
 from zope.component import queryMultiAdapter
-from zope.app.traversing.interfaces import TraversalError
-from zope.app.traversing.namespace import nsParse
-from zope.app.traversing.namespace import namespaceLookup
+from zope.traversing.interfaces import TraversalError
+from zope.traversing.namespace import nsParse, namespaceLookup
 
 _marker = object()
 
 
 class Traversable:
-
     implements(ITraversable)
 
     security = ClassSecurityInfo()

lib/python/Products/PageTemplates/Expressions.py

@@ -250,11 +250,10 @@ class NotExpr:
 
 from zope.interface import Interface, implements
 from zope.component import queryMultiAdapter
-from zope.app.traversing.namespace import nsParse
-from zope.app.traversing.namespace import namespaceLookup
-from zope.app.traversing.interfaces import TraversalError
+from zope.traversing.interfaces import TraversalError
+from zope.traversing.namespace import nsParse, namespaceLookup
 from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.app.publication.browser import setDefaultSkin
+from zope.publisher.browser import setDefaultSkin
 
 class FakeRequest(dict):
     implements(IBrowserRequest)

lib/python/ZPublisher/BaseRequest.py

@@ -29,9 +29,8 @@ from zope.publisher.interfaces import IPublishTraverse
 from zope.component.interfaces import IDefaultViewName
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.publisher.interfaces.browser import IBrowserRequest
-from zope.app.traversing.interfaces import TraversalError
-from zope.app.traversing.namespace import nsParse
-from zope.app.traversing.namespace import namespaceLookup
+from zope.traversing.interfaces import TraversalError
+from zope.traversing.namespace import nsParse, namespaceLookup
 
 UNSPECIFIED_ROLES=''