[Zope3-checkins] CVS: Zope3/src/zope/publisher - base.py:1.1.2.2 browser.py:1.1.2.2 http.py:1.1.2.2 publish.py:1.1.2.2
Guido van Rossum
guido@python.org
Mon, 23 Dec 2002 16:05:17 -0500
Update of /cvs-repository/Zope3/src/zope/publisher
In directory cvs.zope.org:/tmp/cvs-serv7136
Modified Files:
Tag: NameGeddon-branch
base.py browser.py http.py publish.py
Log Message:
tests run in zope/publisher
=== Zope3/src/zope/publisher/base.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/publisher/base.py:1.1.2.1 Mon Dec 23 14:33:08 2002
+++ Zope3/src/zope/publisher/base.py Mon Dec 23 16:04:47 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.
-#
+#
##############################################################################
'''Response Output formatter
@@ -18,8 +18,20 @@
import traceback
-from zope.interfaces.publisher import IPublisherResponse
-from zope.interfaces.publisher import IApplicationResponse
+from cStringIO import StringIO
+
+from zope.interface.common.mapping import IReadMapping, IEnumerableMapping
+from zope.exceptions import NotFoundError
+
+from zope.publisher.interfaces import IPublication
+from zope.publisher.interfaces import NotFound, DebugError, Unauthorized
+from zope.publisher.interfaces import IApplicationResponse
+from zope.publisher.interfaces import IApplicationRequest
+from zope.publisher.interfaces import IPublicationRequest
+from zope.publisher.interfaces import IPublisherResponse
+from zope.publisher.interfaces import IPublisherRequest
+
+from zope.publisher.publish import mapply
class IResponse(IPublisherResponse, IApplicationResponse):
@@ -38,7 +50,7 @@
__implements__ = IResponse
-
+
def __init__(self, outstream):
self._body = ''
self._outstream = outstream
@@ -93,7 +105,6 @@
$Id$
"""
-from zope.interface.common.mapping import IReadMapping, IEnumerableMapping
class RequestDataGetter(object):
@@ -107,7 +118,7 @@
def get(self, name, default=None):
return self.__get(name, default)
-
+
def __contains__(self, key):
lookup = self.get(key, self)
return lookup is not self
@@ -151,19 +162,6 @@
raise AttributeError, 'Unassignable attribute'
-"""
-
-$Id$
-"""
-
-
-from zope.interfaces.publisher import IApplicationRequest
-from zope.interfaces.publisher import IPublisherRequest
-from zope.interfaces.publisher import IPublicationRequest
-
-from cStringIO import StringIO
-
-from zope.exceptions import NotFoundError
class IRequest(IPublisherRequest, IPublicationRequest, IApplicationRequest):
"""The basic request contract
@@ -176,7 +174,7 @@
class BaseRequest(object):
"""Represents a publishing request.
-
+
This object provides access to request data. Request data may
vary depending on the protocol used.
@@ -258,7 +256,7 @@
traversal_stack = self._traversal_stack
traversed_names = self._traversed_names
-
+
prev_object = None
while 1:
if object is not prev_object:
@@ -408,14 +406,14 @@
if result is not self: return result
return default
-
+
def __contains__(self, key):
'See Interface.Common.Mapping.IReadMapping'
lookup = self.get(key, self)
return lookup is not self
has_key = __contains__
-
+
#
############################################################
@@ -444,7 +442,7 @@
self._endswithslash = 1
else:
self._endswithslash = 0
-
+
clean = []
for item in path.split('/'):
if not item or item == '.':
@@ -476,17 +474,6 @@
super(TestRequest, self).__init__(body_instream, outstream, environ)
-
-
-
-
-
-
-
-from zope.interfaces.publisher import IPublication
-from zope.interfaces.publisher import NotFound, DebugError, Unauthorized
-from zope.publisher.publish import mapply
-
class DefaultPublication:
__implements__ = IPublication
@@ -544,7 +531,7 @@
class TestPublication(DefaultPublication):
-
+
def traverseName(self, request, ob, name, check_auth=1):
if hasattr(ob, name):
subob = getattr(ob, name)
=== Zope3/src/zope/publisher/browser.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/publisher/browser.py:1.1.2.1 Mon Dec 23 14:33:08 2002
+++ Zope3/src/zope/publisher/browser.py Mon Dec 23 16:04:47 2002
@@ -807,7 +807,7 @@
from cgi import escape
from zope.publisher.http import HTTPResponse
-from zope.interfaces.publisher import Redirect
+from zope.publisher.interfaces import Redirect
start_of_header_search=re.compile('(<head[^>]*>)', re.IGNORECASE).search
=== Zope3/src/zope/publisher/http.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/publisher/http.py:1.1.2.1 Mon Dec 23 14:33:08 2002
+++ Zope3/src/zope/publisher/http.py Mon Dec 23 16:04:47 2002
@@ -524,7 +524,7 @@
from zope.component import queryAdapter
from zope.publisher.base import BaseResponse
-from zope.interfaces.publisher import Redirect
+from zope.publisher.interfaces import Redirect
from zope.publisher.interfaces.http import IHTTPResponse
from zope.publisher.interfaces.http import IHTTPApplicationResponse
from zope.exceptions.exceptionformatter import format_exception
=== Zope3/src/zope/publisher/publish.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/publisher/publish.py:1.1.2.1 Mon Dec 23 14:33:08 2002
+++ Zope3/src/zope/publisher/publish.py Mon Dec 23 16:04:47 2002
@@ -114,7 +114,7 @@
import sys, os
-from zope.interfaces.publisher import Retry
+from zope.publisher.interfaces import Retry
def publish(request, handle_errors=1):
try: # finally to clean up to_raise and close request