[Zope3-checkins] CVS: Zope3/src/zope/app/publication - publicationtraverse.py:1.1.2.2 traversers.py:1.1.2.2 vfs.py:1.1.2.2 zopepublication.py:1.1.2.2

Guido van Rossum guido@python.org
Mon, 23 Dec 2002 18:18:05 -0500


Update of /cvs-repository/Zope3/src/zope/app/publication
In directory cvs.zope.org:/tmp/cvs-serv30197/src/zope/app/publication

Modified Files:
      Tag: NameGeddon-branch
	publicationtraverse.py traversers.py vfs.py zopepublication.py 
Log Message:
Fix interfaces.publisher -> publisher.interfaces mixup.

=== Zope3/src/zope/app/publication/publicationtraverse.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publication/publicationtraverse.py:1.1.2.1	Mon Dec 23 14:31:59 2002
+++ Zope3/src/zope/app/publication/publicationtraverse.py	Mon Dec 23 18:17:34 2002
@@ -17,7 +17,7 @@
 """
 
 from zope.component import queryView, getService
-from zope.interfaces.publisher import NotFound
+from zope.publisher.interfaces import NotFound
 from types import StringTypes
 from zope.proxy.context.context import ContextWrapper 
 
@@ -25,7 +25,7 @@
 from zope.proxy.introspection import removeAllProxies
 from zope.app.traversing.namespaces import namespaceLookup
 from zope.app.traversing.parameterparsing import parameterizedNameParse
-from zope.interfaces.publisher import IPublishTraverse
+from zope.publisher.interfaces import IPublishTraverse
 
 class DuplicateNamespaces(Exception):
     """More than one namespace was specified in a request"""


=== Zope3/src/zope/app/publication/traversers.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publication/traversers.py:1.1.2.1	Mon Dec 23 14:31:59 2002
+++ Zope3/src/zope/app/publication/traversers.py	Mon Dec 23 18:17:34 2002
@@ -16,7 +16,7 @@
 __metaclass__ = type
 
 
-from zope.interfaces.publisher import Unauthorized, NotFound, DebugError
+from zope.publisher.interfaces import Unauthorized, NotFound, DebugError
 from zope.publisher.interfaces.browser import IBrowserPublisher
 from zope.publisher.interfaces.xmlrpc import IXMLRPCPublisher
 from zope.component \


=== Zope3/src/zope/app/publication/vfs.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publication/vfs.py:1.1.2.1	Mon Dec 23 14:31:59 2002
+++ Zope3/src/zope/app/publication/vfs.py	Mon Dec 23 18:17:34 2002
@@ -19,7 +19,7 @@
 from zope.app.publication.zopepublication import ZopePublication
 
 from zope.component import queryView
-from zope.interfaces.publisher import NotFound
+from zope.publisher.interfaces import NotFound
 from zope.publisher.publish import mapply
 
 


=== Zope3/src/zope/app/publication/zopepublication.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publication/zopepublication.py:1.1.2.1	Mon Dec 23 14:31:59 2002
+++ Zope3/src/zope/app/publication/zopepublication.py	Mon Dec 23 18:17:34 2002
@@ -20,7 +20,7 @@
 
 from zope.publisher.base import DefaultPublication
 from zope.publisher.publish import mapply
-from zope.interfaces.publisher import Retry
+from zope.publisher.interfaces import Retry
 
 from zope.security.securitymanagement import getSecurityManager
 from zope.security.securitymanagement import newSecurityManager