[Zope3-checkins] CVS: Zope3/src/zope/publisher - base.py:1.12
ftp.py:1.7 http.py:1.38 xmlrpc.py:1.10
Jim Fulton
cvs-admin at zope.org
Fri Nov 21 12:13:00 EST 2003
Update of /cvs-repository/Zope3/src/zope/publisher
In directory cvs.zope.org:/tmp/cvs-serv32719/src/zope/publisher
Modified Files:
base.py ftp.py http.py xmlrpc.py
Log Message:
Requests no longer need to track presentation types, since resources
and views are now registered as adapters of requests.
=== Zope3/src/zope/publisher/base.py 1.11 => 1.12 ===
--- Zope3/src/zope/publisher/base.py:1.11 Sun Aug 17 02:09:14 2003
+++ Zope3/src/zope/publisher/base.py Fri Nov 21 12:12:28 2003
@@ -294,21 +294,6 @@
'See IPresentationRequest'
return getattr(self, '_presentation_skin', '')
- def getPresentationType(self):
- 'See IPresentationRequest'
- return getattr(self, '_presentation_type', None)
-
- # This is not part of the interface:
- def setViewType(self, viewtype):
- '''Set the view type.
-
- This method will normally only be called in tests, which will allow
- us to use a simpler Request set-up.'''
-
- # XXX This will probably go away
-
- self._presentation_type = viewtype
-
def _getBody(self):
body = getattr(self, '_body', None)
if body is None:
=== Zope3/src/zope/publisher/ftp.py 1.6 => 1.7 ===
--- Zope3/src/zope/publisher/ftp.py:1.6 Tue Jun 3 18:46:27 2003
+++ Zope3/src/zope/publisher/ftp.py Fri Nov 21 12:12:28 2003
@@ -17,8 +17,7 @@
"""
from zope.interface import implements
-from zope.publisher.interfaces.ftp import IFTPPresentation
-from zope.publisher.interfaces.ftp import IFTPCredentials
+from zope.publisher.interfaces.ftp import IFTPCredentials, IFTPRequest
from zope.publisher.base import BaseResponse, BaseRequest
class FTPResponse(BaseResponse):
@@ -37,9 +36,7 @@
self._exc = exc_info
class FTPRequest(BaseRequest):
- implements(IFTPCredentials)
-
- _presentation_type = IFTPPresentation
+ implements(IFTPCredentials, IFTPRequest)
__slots__ = '_auth'
=== Zope3/src/zope/publisher/http.py 1.37 => 1.38 ===
--- Zope3/src/zope/publisher/http.py:1.37 Mon Nov 3 23:04:22 2003
+++ Zope3/src/zope/publisher/http.py Fri Nov 21 12:12:28 2003
@@ -28,7 +28,6 @@
from zope.publisher.interfaces.http import IHTTPRequest
from zope.publisher.interfaces.http import IHTTPApplicationRequest
from zope.publisher.interfaces.http import IHTTPPublisher
-from zope.publisher.interfaces.http import IHTTPPresentation
from zope.publisher.interfaces import Redirect
from zope.publisher.interfaces.http import IHTTPResponse
@@ -264,9 +263,6 @@
values will be looked up in the order: environment variables,
other variables, form data, and then cookies.
"""
-
- _presentation_type = IHTTPPresentation
-
implements(IHTTPCredentials, IHTTPRequest, IHTTPApplicationRequest)
=== Zope3/src/zope/publisher/xmlrpc.py 1.9 => 1.10 ===
--- Zope3/src/zope/publisher/xmlrpc.py:1.9 Mon Aug 4 19:19:23 2003
+++ Zope3/src/zope/publisher/xmlrpc.py Fri Nov 21 12:12:28 2003
@@ -24,8 +24,7 @@
from zope.interface import implements
from zope.publisher.interfaces.xmlrpc import IXMLRPCPublisher
-from zope.publisher.interfaces.xmlrpc import IXMLRPCPublication
-from zope.publisher.interfaces.xmlrpc import IXMLRPCPresentation
+from zope.publisher.interfaces.xmlrpc import IXMLRPCRequest
from zope.publisher.interfaces.xmlrpc import IXMLRPCView
from zope.publisher.http import HTTPRequest, HTTPResponse
@@ -58,11 +57,7 @@
class XMLRPCRequest(HTTPRequest):
- implements(IXMLRPCPublication)
-
- # _presentation_type is overridden from the BaseRequest
- # to implement IXMLRPCPublisher
- _presentation_type = IXMLRPCPresentation
+ implements(IXMLRPCRequest)
_args = ()
More information about the Zope3-Checkins
mailing list