[Zope3-checkins] CVS: Zope3/src/zope/app/publication - browser.py:1.1.2.3 http.py:1.1.2.2 publicationtraverse.py:1.1.2.4 traversers.py:1.1.2.3 vfs.py:1.1.2.3 xmlrpc.py:1.1.2.2 zopepublication.py:1.1.2.4
Tim Peters
tim.one@comcast.net
Tue, 24 Dec 2002 21:21:40 -0500
Update of /cvs-repository/Zope3/src/zope/app/publication
In directory cvs.zope.org:/tmp/cvs-serv19240/src/zope/app/publication
Modified Files:
Tag: NameGeddon-branch
browser.py http.py publicationtraverse.py traversers.py vfs.py
xmlrpc.py zopepublication.py
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py. The
files are fixed-points of that script now. Fixed a few cases where
code relied on significant trailing whitespace (ouch).
=== Zope3/src/zope/app/publication/browser.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/publication/browser.py:1.1.2.2 Mon Dec 23 18:52:33 2002
+++ Zope3/src/zope/app/publication/browser.py Tue Dec 24 21:20:39 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""XXX short summary goes here.
@@ -24,7 +24,7 @@
from zope.publisher.interfaces.browser import IBrowserPublisher
from zope.component import queryAdapter
-class PublicationTraverser(PublicationTraverser_):
+class PublicationTraverser(PublicationTraverser_):
def traverseRelativeURL(self, request, ob, path):
@@ -37,7 +37,7 @@
ob, path = adapter.browserDefault(request)
if not path:
return ob
-
+
ob = self.traversePath(request, ob, path)
@@ -55,7 +55,7 @@
class BrowserPublication(ZopeHTTPPublication):
"""Web browser publication handling."""
-
+
def getDefaultTraversal(self, request, ob):
r = ()
@@ -70,7 +70,7 @@
return (ob, None)
if r[0] is ob: return r
-
+
wrapped = ContextWrapper(r[0], ob, name=None)
return (wrapped, r[1])
@@ -82,4 +82,3 @@
def __call__(self):
return self.__pub
-
=== Zope3/src/zope/app/publication/http.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publication/http.py:1.1.2.1 Mon Dec 23 14:31:59 2002
+++ Zope3/src/zope/app/publication/http.py Tue Dec 24 21:20:39 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
=== Zope3/src/zope/app/publication/publicationtraverse.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/publication/publicationtraverse.py:1.1.2.3 Mon Dec 23 18:52:33 2002
+++ Zope3/src/zope/app/publication/publicationtraverse.py Tue Dec 24 21:20:39 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
@@ -19,7 +19,7 @@
from zope.component import queryView, getService
from zope.publisher.interfaces import NotFound
from types import StringTypes
-from zope.proxy.context import ContextWrapper
+from zope.proxy.context import ContextWrapper
from zope.app.interfaces.container import IWriteContainer
from zope.proxy.introspection import removeAllProxies
@@ -29,7 +29,7 @@
class DuplicateNamespaces(Exception):
"""More than one namespace was specified in a request"""
-
+
class UnknownNamespace(Exception):
"""A parameter specified an unknown namespace"""
@@ -39,7 +39,7 @@
nm = name # the name to look up the object with
if name and name[:1] in '@+':
- # Process URI segment parameters.
+ # Process URI segment parameters.
ns, nm, parms = parameterizedNameParse(name)
unknown_parms = ()
@@ -61,14 +61,14 @@
';'.join(["%s=%s" % (parm[0], parm[1])
for parm in unknown_parms])
)
-
+
if not nm:
# Just set params, so skip
return ob
if nm == '.':
return ob
-
+
if IPublishTraverse.isImplementedBy(removeAllProxies(ob)):
ob2 = ob.publishTraverse(request, nm)
else:
@@ -80,7 +80,7 @@
return ContextWrapper(ob2, ob, name=name)
-class PublicationTraverser(PublicationTraverse):
+class PublicationTraverser(PublicationTraverse):
def traversePath(self, request, ob, path):
@@ -103,7 +103,7 @@
if l < 0 or l+2 > len(path):
break
del path[l:l+2]
-
+
pop = path.pop
while path:
=== Zope3/src/zope/app/publication/traversers.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/publication/traversers.py:1.1.2.2 Mon Dec 23 18:17:34 2002
+++ Zope3/src/zope/app/publication/traversers.py Tue Dec 24 21:20:39 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"$Id"
@@ -34,7 +34,7 @@
def browserDefault(self, request):
ob = self.context
-
+
view_name = getDefaultViewName(ob, request)
return ob, (view_name,)
@@ -58,7 +58,7 @@
def browserDefault(self, request):
ob = self.context
-
+
view_name = getDefaultViewName(ob, request)
view = self.publishTraverse(request, view_name)
if hasattr(view, 'browserDefault'):
@@ -68,11 +68,11 @@
path = ()
else:
path = ()
-
+
return view, path
class TestTraverser:
- "Bobo-style traverser, mostly useful for testing"
+ "Bobo-style traverser, mostly useful for testing"
__implements__ = IBrowserPublisher
@@ -83,18 +83,18 @@
ob = self.context
if hasattr(ob, '__implements__'):
-
+
view_name = getDefaultViewName(ob, request)
return ob, (("@@%s" % view_name),)
-
+
return ob, ()
def publishTraverse(self, request, name):
ob = self.context
if name.startswith('@@'):
return getView(ob, name[6:], request)
-
+
if name.startswith('_'):
raise Unauthorized("Name %s begins with an underscore" % `name`)
=== Zope3/src/zope/app/publication/vfs.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/app/publication/vfs.py:1.1.2.2 Mon Dec 23 18:17:34 2002
+++ Zope3/src/zope/app/publication/vfs.py Tue Dec 24 21:20:39 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""
@@ -29,7 +29,7 @@
def callObject(self, request, ob):
- view = queryView(ob, 'vfs', request, self)
+ view = queryView(ob, 'vfs', request, self)
#view = ob
if view is not self:
@@ -38,4 +38,3 @@
raise NotFound(ob, 'vfs', request)
return mapply(method, request.getPositionalArguments(), request)
-
=== Zope3/src/zope/app/publication/xmlrpc.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publication/xmlrpc.py:1.1.2.1 Mon Dec 23 14:31:59 2002
+++ Zope3/src/zope/app/publication/xmlrpc.py Tue Dec 24 21:20:39 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
=== Zope3/src/zope/app/publication/zopepublication.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/app/publication/zopepublication.py:1.1.2.3 Mon Dec 23 18:52:33 2002
+++ Zope3/src/zope/app/publication/zopepublication.py Tue Dec 24 21:20:39 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
import sys
import logging
@@ -93,7 +93,7 @@
return
sm = ContextWrapper(sm, ob, name="++etc++Services")
-
+
auth_service = sm.get('Authentication')
if auth_service is None:
# No auth service here
@@ -109,7 +109,7 @@
newSecurityManager(principal.getId())
request.user = principal
-
+
def callTraversalHooks(self, request, ob):
# Call __before_publishing_traverse__ hooks
@@ -120,7 +120,7 @@
def afterTraversal(self, request, ob):
#recordMetaData(object, request)
self._maybePlacefullyAuthenticate(request, ob)
-
+
def openedConnection(self, conn):
# Hook for auto-refresh
@@ -134,7 +134,7 @@
if '++etc++ApplicationController' in stack:
return applicationControllerRoot
-
+
# Open the database.
version = request.get(self.version_cookie, '')
conn = self.db.open(version)
@@ -147,7 +147,7 @@
root = conn.root()
app = root.get(self.root_name, None)
-
+
if app is None:
raise SystemError, "Zope Application Not Found"
@@ -202,8 +202,8 @@
return
# XXX This is wrong. Should use getRequstView:
- #
- #
+ #
+ #
# # Look for a component to handle the exception.
# traversed = request.traversed
# if traversed:
@@ -234,7 +234,7 @@
def _parameterSetskin(self, pname, pval, request):
request.setViewSkin(pval)
-
+
class DebugPublication(object):
class call_wrapper: