[Zope3-checkins] CVS: Zope3/src/zope/publisher - base.py:1.1.2.3 browser.py:1.1.2.3 configure.zcml:1.1.2.2 http.py:1.1.2.3 vfs.py:1.1.2.2 xmlrpc.py:1.1.2.2
Jim Fulton
jim@zope.com
Tue, 24 Dec 2002 07:51:59 -0500
Update of /cvs-repository/Zope3/src/zope/publisher
In directory cvs.zope.org:/tmp/cvs-serv1158/src/zope/publisher
Modified Files:
Tag: NameGeddon-branch
base.py browser.py configure.zcml http.py vfs.py xmlrpc.py
Log Message:
Searched for and changed over 1200 references to Zope.something.
Most of these were either comments, doc strings, or permission ids.
Many were imports or ids in zcml. (much zcml fixup is still needed.
=== Zope3/src/zope/publisher/base.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/publisher/base.py:1.1.2.2 Mon Dec 23 16:04:47 2002
+++ Zope3/src/zope/publisher/base.py Tue Dec 24 07:51:28 2002
@@ -55,19 +55,12 @@
self._body = ''
self._outstream = outstream
- ############################################################
- # Implementation methods for interface
- # Zope.Publisher.BaseResponse.IResponse
-
- ######################################
- # from: Zope.Publisher.IPublisherResponse.IPublisherResponse
-
def outputBody(self):
- 'See Zope.Publisher.IPublisherResponse.IPublisherResponse'
+ 'See IPublisherResponse'
self._outstream.write(self._getBody())
def setBody(self, body):
- 'See Zope.Publisher.IPublisherResponse.IPublisherResponse'
+ 'See IPublisherResponse'
self._body = body
# This method is not part of this interface
@@ -76,36 +69,22 @@
return self._body
def handleException(self, exc_info):
- 'See Zope.Publisher.IPublisherResponse.IPublisherResponse'
+ 'See IPublisherResponse'
traceback.print_exception(
exc_info[0], exc_info[1], exc_info[2], 100, self)
def internalError(self):
- 'See Zope.Publisher.IPublisherResponse.IPublisherResponse'
+ 'See IPublisherResponse'
pass
def retry(self):
- 'See Zope.Publisher.IPublisherResponse.IPublisherResponse'
+ 'See IPublisherResponse'
return self.__class__(self.outstream)
- ######################################
- # from: Zope.Publisher.IApplicationResponse.IApplicationResponse
-
def write(self, string):
- 'See Zope.Publisher.IApplicationResponse.IApplicationResponse'
+ 'See IApplicationResponse'
self._body += string
- #
- ############################################################
-
-
-"""
-
-Revision information:
-$Id$
-"""
-
-
class RequestDataGetter(object):
__implements__ = IReadMapping
@@ -218,39 +197,31 @@
self._held = ()
self.user = None
-
- ############################################################
- # Implementation methods for interface
- # Zope.Publisher.BaseRequest.IRequest
-
- ######################################
- # from: Zope.Publisher.IPublisherRequest.IPublisherRequest
-
def _getPublication(self):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
return getattr(self, '_publication', None)
publication = property(_getPublication)
def processInputs(self):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
# Nothing to do here
def retry(self):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
raise TypeError('Retry is not supported')
def setPublication(self, pub):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
self._publication = pub
def supportsRetry(self):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
return 0
def traverse(self, object):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
publication = self.publication
@@ -278,18 +249,15 @@
return object
- ######################################
- # from: Zope.Publisher.IPublicationRequest.IPublicationRequest
-
def close(self):
- 'See Zope.Publisher.IPublicationRequest.IPublicationRequest'
+ 'See IPublicationRequest'
self._held = None
self._response = None
self._body_instream = None
self._publication = None
def getPositionalArguments(self):
- 'See Zope.Publisher.IPublicationRequest.IPublicationRequest'
+ 'See IPublicationRequest'
return self._args
def _getResponse(self):
@@ -298,31 +266,27 @@
response = property(_getResponse)
def getTraversalStack(self):
- 'See Zope.Publisher.IPublicationRequest.IPublicationRequest'
+ 'See IPublicationRequest'
return list(self._traversal_stack) # Return a copy
def hold(self, object):
- 'See Zope.Publisher.IPublicationRequest.IPublicationRequest'
+ 'See IPublicationRequest'
self._held = self._held + (object,)
def setTraversalStack(self, stack):
- 'See Zope.Publisher.IPublicationRequest.IPublicationRequest'
+ 'See IPublicationRequest'
self._traversal_stack[:] = list(stack)
def setViewSkin(self, skin):
- 'See Zope.Publisher.IPublicationRequest.IPublicationRequest'
+ 'See IPublicationRequest'
self._presentation_skin = skin
- ######################################
- # from:
- # Zope.ComponentArchitecture.IPresentationService.IPresentationRequest
-
def getPresentationSkin(self):
- 'See Zope.ComponentArchitecture.IViewService.IPresentationRequest'
+ 'See IPresentationRequest'
return getattr(self, '_presentation_skin', '')
def getPresentationType(self):
- 'See Zope.ComponentArchitecture.IViewService.IPresentationRequest'
+ 'See IPresentationRequest'
return getattr(self, '_presentation_type', None)
# This is not part of the interface:
@@ -336,10 +300,6 @@
self._presentation_type = viewtype
-
- ######################################
- # from: Zope.Publisher.IApplicationRequest.IApplicationRequest
-
def _getBody(self):
body = getattr(self, '_body', None)
if body is None:
@@ -356,14 +316,11 @@
body = property(_getBody)
def _getBodyFile(self):
- 'See Zope.Publisher.IApplicationRequest.IApplicationRequest'
+ 'See IApplicationRequest'
return self._body_instream
bodyFile = property(_getBodyFile)
- ######################################
- # from: Interface.Common.Mapping.IEnumerableMapping
-
def __len__(self):
'See Interface.Common.Mapping.IEnumerableMapping'
return len(self.keys())
@@ -388,9 +345,6 @@
result.append(get(k))
return result
- ######################################
- # from: Interface.Common.Mapping.IReadMapping
-
def __getitem__(self, key):
'See Interface.Common.Mapping.IReadMapping'
result = self.get(key, _marker)
@@ -413,9 +367,6 @@
return lookup is not self
has_key = __contains__
-
- #
- ############################################################
def _createResponse(self, outstream):
# Should be overridden by subclasses
=== Zope3/src/zope/publisher/browser.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/publisher/browser.py:1.1.2.2 Mon Dec 23 16:04:47 2002
+++ Zope3/src/zope/publisher/browser.py Tue Dec 24 07:51:28 2002
@@ -136,7 +136,9 @@
"""
from zope.interfaces.i18n import IUserPreferredLanguages
+from zope.publisher.interfaces.browser import IBrowserView
+__metaclass__ = type # All classes are new style when run with Python 2.2+
class BrowserLanguages:
@@ -145,10 +147,6 @@
def __init__(self, request):
self.request = request
- ############################################################
- # Implementation methods for interface
- # Zope.I18n.IUserPreferredLanguages.
-
def getPreferredLanguages(self):
'''See interface IUserPreferredLanguages'''
langs = []
@@ -158,17 +156,6 @@
langs.append(lang.split(';')[0])
return langs
- #
- ############################################################
-
-
-"""
-
-$Id$
-"""
-__metaclass__ = type # All classes are new style when run with Python 2.2+
-
-from zope.publisher.interfaces.browser import IBrowserView
class BrowserView:
@@ -261,11 +248,8 @@
pass
return text
- ######################################
- # from: Zope.Publisher.IPublisherRequest.IPublisherRequest
-
def processInputs(self):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
environ = self._environ
form = self.form
@@ -604,10 +588,8 @@
self.setPathSuffix((meth,))
- ######################################
- # from: Zope.Publisher.IPublisherRequest.IPublisherRequest
def traverse(self, object):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
ob = super(BrowserRequest, self).traverse(object)
method = self._environ.get('REQUEST_METHOD', 'GET').upper()
@@ -647,9 +629,6 @@
response.setBase(url)
return ob
-
- ######################################
- # from: Interface.Common.Mapping.IEnumerableMapping
def keys(self):
'See Interface.Common.Mapping.IEnumerableMapping'
@@ -660,9 +639,6 @@
return d.keys()
- ######################################
- # from: Interface.Common.Mapping.IReadMapping
-
def get(self, key, default=None):
'See Interface.Common.Mapping.IReadMapping'
@@ -676,9 +652,6 @@
if result is not self: return result
return default
-
- #
- ############################################################
class FileUpload(object):
'''\
=== Zope3/src/zope/publisher/configure.zcml 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/publisher/configure.zcml:1.1.2.1 Mon Dec 23 14:33:08 2002
+++ Zope3/src/zope/publisher/configure.zcml Tue Dec 24 07:51:28 2002
@@ -11,13 +11,13 @@
<content class="zope.publisher.http.HTTPRequest">
<require
- permission="Zope.View"
+ permission="zope.View"
interface="zope.publisher.interfaces.http.IHTTPApplicationRequest"/>
</content>
<content class="zope.publisher.http.URLGetter">
<require
- permission="Zope.View"
+ permission="zope.View"
attributes="get __getitem__ __str__" />
</content>
=== Zope3/src/zope/publisher/http.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/publisher/http.py:1.1.2.2 Mon Dec 23 16:04:47 2002
+++ Zope3/src/zope/publisher/http.py Tue Dec 24 07:51:28 2002
@@ -270,11 +270,8 @@
def __setupPath(self):
self._setupPath_helper("PATH_INFO")
- ######################################
- # from: Zope.Publisher.IPublisherRequest.IPublisherRequest
-
def supportsRetry(self):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
count = getattr(self, '_retry_count', 0)
if count < self.retry_max_count:
if STAGGER_RETRIES:
@@ -283,7 +280,7 @@
def retry(self):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
count = getattr(self, '_retry_count', 0)
self._retry_count = count + 1
self._body_instream.seek(0)
@@ -300,7 +297,7 @@
def traverse(self, object):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
ob = super(HTTPRequest, self).traverse(object)
if self._path_suffix:
@@ -328,15 +325,8 @@
return clean
- #
- ######################################
-
- ############################################################
- # Implementation methods for interface
- # Zope.Publisher.HTTP.IHTTPRequest.
-
def getHeader(self, name, default=None):
- 'See Zope.Publisher.HTTP.IHTTPRequest.IHTTPRequest'
+ 'See IHTTPRequest'
environ = self._environ
name = name.replace('-', '_').upper()
val = environ.get(name, None)
@@ -349,26 +339,19 @@
headers = RequestDataProperty(HeaderGetter)
def getCookies(self):
- 'See Zope.Publisher.HTTP.IHTTPRequest.IHTTPRequest'
+ 'See IHTTPRequest'
return self._cookies
cookies = RequestDataProperty(CookieMapper)
def setPathSuffix(self, steps):
- 'See Zope.Publisher.HTTP.IHTTPRequest.IHTTPRequest'
+ 'See IHTTPRequest'
steps = list(steps)
steps.reverse()
self._path_suffix = steps
- #
- ############################################################
-
- ############################################################
- # Implementation methods for interface
- # Zope.Publisher.HTTP.IHTTPCredentials.
-
def _authUserPW(self):
- 'See Zope.Publisher.HTTP.IHTTPCredentials.IHTTPCredentials'
+ 'See IHTTPCredentials'
global base64
auth=self._auth
if auth:
@@ -379,7 +362,7 @@
return name, password
def unauthorized(self, challenge):
- 'See Zope.Publisher.HTTP.IHTTPCredentials.IHTTPCredentials'
+ 'See IHTTPCredentials'
self._response.setHeader("WWW-Authenticate", challenge, 1)
self._response.setStatus(401)
@@ -425,9 +408,6 @@
URL = RequestDataProperty(URLGetter)
- ######################################
- # from: Interface.Common.Mapping.IReadMapping
-
def get(self, key, default=None):
'See Interface.Common.Mapping.IReadMapping'
@@ -439,12 +419,6 @@
return default
- #
- ############################################################
-
- ######################################
- # from: Interface.Common.Mapping.IEnumerableMapping
-
def keys(self):
'See Interface.Common.Mapping.IEnumerableMapping'
d = {}
@@ -636,14 +610,9 @@
def setHeaderOutput(self, header_output):
self._header_output = header_output
-
-
- ############################################################
- # Implementation methods for interface
- # Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse
def setStatus(self, status, reason=None):
- 'See Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse'
+ 'See IHTTPResponse'
if status is None:
status = 200
else:
@@ -667,12 +636,12 @@
def getStatus(self):
- 'See Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse'
+ 'See IHTTPResponse'
return self._status
def setHeader(self, name, value, literal=0):
- 'See Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse'
+ 'See IHTTPResponse'
name = str(name)
value = str(value)
@@ -686,18 +655,18 @@
def addHeader(self, name, value):
- 'See Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse'
+ 'See IHTTPResponse'
accum = self._accumulated_headers
accum.append('%s: %s' % (name, value))
def getHeader(self, name, default=None):
- 'See Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse'
+ 'See IHTTPResponse'
return self._headers.get(name.lower(), default)
def getHeaders(self):
- 'See Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse'
+ 'See IHTTPResponse'
result = {}
headers = self._headers
@@ -724,7 +693,7 @@
def appendToHeader(self, name, value, delimiter=','):
- 'See Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse'
+ 'See IHTTPResponse'
headers = self._headers
if name in headers:
h = self._header[name]
@@ -734,7 +703,7 @@
def appendToCookie(self, name, value):
- 'See Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse'
+ 'See IHTTPResponse'
cookies = self._cookies
if name in cookies:
cookie = cookies[name]
@@ -745,7 +714,7 @@
def expireCookie(self, name, **kw):
- 'See Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse'
+ 'See IHTTPResponse'
dict={'max_age':0, 'expires':'Wed, 31-Dec-97 23:59:59 GMT'}
for k, v in kw.items():
dict[k]=v
@@ -757,7 +726,7 @@
def setCookie(self, name, value, **kw):
- 'See Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse'
+ 'See IHTTPResponse'
cookies=self._cookies
if name in cookies:
@@ -772,12 +741,12 @@
def setCharset(self, charset=None):
- 'See Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse'
+ 'See IHTTPResponse'
self._charset = charset
def setCharsetUsingRequest(self, request):
- 'See Zope.Publisher.HTTP.IHTTPResponse.IHTTPResponse'
+ 'See IHTTPResponse'
envadaptor = queryAdapter(request, IUserPreferredCharsets)
if envadaptor is None:
return
@@ -789,16 +758,6 @@
charset = 'UTF-8'
self.setCharset(charset)
- #
- ############################################################
-
- ############################################################
- # Implementation methods for interface
- # Zope.Publisher.BaseResponse.IResponse
-
- ######################################
- # from: Zope.Publisher.IPublisherResponse.IPublisherResponse
-
def setBody(self, body):
self._body = unicode(body)
if not self._status_set:
@@ -827,7 +786,7 @@
def internalError(self):
- 'See Zope.Publisher.IPublisherResponse.IPublisherResponse'
+ 'See IPublisherResponse'
self.setStatus(500, u"The engines can't take any more, Jim!")
@@ -916,14 +875,8 @@
self._outstream.write(headers_text)
- ######################################
- # from: Zope.Publisher.IApplicationResponse.IApplicationResponse
-
- # XXX: Mmh, it seems that write has a different meaning here
- # compared to BaseResponse
-
def write(self, string):
- """See Zope.Publisher.IApplicationResponse.IApplicationResponse
+ """See IApplicationResponse
Return data as a stream
@@ -940,10 +893,6 @@
"""
self.output(string)
- #
- ############################################################
-
-
def output(self, data):
if not self._wrote_headers:
self.outputHeaders()
@@ -1012,18 +961,11 @@
__implements__ = IHTTPPublisher
- ############################################################
- # Implementation methods for interface
- # Zope.Publisher.HTTP.IHTTPPublisher
-
def publishTraverse(self, request, name):
- 'See Zope.Publisher.HTTP.IHTTPPublisher.IHTTPPublisher'
+ 'See IHTTPPublisher'
return getattr(self, name)
- #
- ############################################################
-
"""Retrieval of browser character set information.
@@ -1048,10 +990,6 @@
def __init__(self, request):
self.request = request
- ############################################################
- # Implementation methods for interface
- # Zope.I18n.IUserPreferredCharsets.
-
def getPreferredCharsets(self):
'''See interface IUserPreferredCharsets'''
charsets = []
@@ -1088,6 +1026,3 @@
# XXX Please give more details as to why!
charsets.sort(sort_charsets)
return [c[1] for c in charsets]
-
- #
- ############################################################
=== Zope3/src/zope/publisher/vfs.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/publisher/vfs.py:1.1.2.1 Mon Dec 23 14:33:08 2002
+++ Zope3/src/zope/publisher/vfs.py Tue Dec 24 07:51:28 2002
@@ -37,7 +37,7 @@
def outputBody(self):
- 'See Zope.Publisher.IPublisherResponse.IPublisherResponse'
+ 'See IPublisherResponse'
pass
@@ -104,13 +104,8 @@
"""Create a specific XML-RPC response object."""
return VFSResponse(outstream)
-
- ############################################################
- # Implementation methods for interface
- # Zope.Publisher.VFS.IVFSCredentials.
-
def _authUserPW(self):
- 'See Zope.Publisher.VFS.IVFSCredentials.IVFSCredentials'
+ 'See IVFSCredentials'
# XXX This is wrong. Instead of _authUserPW() there should
# be a method of all requests called getCredentials() which
# returns an ICredentials instance.
@@ -118,24 +113,15 @@
return credentials.getUserName(), credentials.getPassword()
def unauthorized(self, challenge):
- 'See Zope.Publisher.VFS.IVFSCredentials.IVFSCredentials'
+ 'See IVFSCredentials'
pass
- #
- ############################################################
-
- ######################################
- # from: Zope.Publisher.IPublisherRequest.IPublisherRequest
def processInputs(self):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
if 'command' in self._environ:
self.method = self._environ['command']
- #
- ############################################################
-
-
def __setupPath(self):
self._setupPath_helper("path")
@@ -180,12 +166,8 @@
def _getSize(self):
return len(self._getData())
- ############################################################
- # Implementation methods for interface
- # Zope.Publisher.VFS.IVFSFilePublisher.
-
def read(self, mode, outstream, start = 0, end = -1):
- """See Zope.Publisher.VFS.IVFSFilePublisher.IVFSFilePublisher"""
+ """See IVFSFilePublisher"""
data = self._getData()
try:
@@ -197,7 +179,7 @@
def write(self, mode, instream, start = 0):
- """See Zope.Publisher.VFS.IVFSFilePublisher.IVFSFilePublisher"""
+ """See IVFSFilePublisher"""
try:
instream.seek(start)
except:
@@ -206,24 +188,21 @@
def check_writable(self, mode):
- """See Zope.Publisher.VFS.IVFSFilePublisher.IVFSFilePublisher"""
+ """See IVFSFilePublisher"""
return 1
- ######################################
- # from: Zope.Publisher.VFS.IVFSObjectPublisher.IVFSObjectPublisher
-
def isdir(self):
- """See Zope.Publisher.VFS.IVFSObjectPublisher.IVFSObjectPublisher"""
+ """See IVFSObjectPublisher"""
return 0
def isfile(self):
- """See Zope.Publisher.VFS.IVFSObjectPublisher.IVFSObjectPublisher"""
+ """See IVFSObjectPublisher"""
return 1
def stat(self):
- """See Zope.Publisher.VFS.IVFSObjectPublisher.IVFSObjectPublisher"""
+ """See IVFSObjectPublisher"""
dc = queryAdapter(self, IZopeDublinCore)
if dc is not None:
modified = dc.modified
@@ -244,13 +223,7 @@
return (504, 0, 0, 0, uid, gid, size, modified, modified, created)
- ######################################
- # from: Zope.Publisher.VFS.IVFSPublisher.IVFSPublisher
-
def publishTraverse(self, request, name):
- """See Zope.Publisher.VFS.IVFSPublisher.IVFSPublisher"""
+ """See IVFSPublisher"""
# Traversing always stops here.
return None
-
- #
- ############################################################
=== Zope3/src/zope/publisher/xmlrpc.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/publisher/xmlrpc.py:1.1.2.1 Mon Dec 23 14:33:08 2002
+++ Zope3/src/zope/publisher/xmlrpc.py Tue Dec 24 07:51:28 2002
@@ -56,12 +56,9 @@
"""Create a specific XML-RPC response object."""
return XMLRPCResponse(outstream)
-
- ###################################################################
- # from: Zope.Publisher.IPublisherRequest.IPublisherRequest
def processInputs(self):
- 'See Zope.Publisher.IPublisherRequest.IPublisherRequest'
+ 'See IPublisherRequest'
# Parse the request XML structure
self._args, function = xmlrpclib.loads(self._body_instream.read())
@@ -70,9 +67,6 @@
if function:
self.setPathSuffix((function,))
-
- #
- ###################################################################
class TestRequest(XMLRPCRequest):