[Zope-Checkins] SVN: Zope/trunk/src/ZPublisher/WSGIPublisher.py Forward port c126486 from 2.13 branch
Hano Schlichting
cvs-admin at zope.org
Thu May 24 16:20:11 UTC 2012
Log message for revision 126487:
Forward port c126486 from 2.13 branch
Changed:
U Zope/trunk/src/ZPublisher/WSGIPublisher.py
-=-
Modified: Zope/trunk/src/ZPublisher/WSGIPublisher.py
===================================================================
--- Zope/trunk/src/ZPublisher/WSGIPublisher.py 2012-05-24 16:18:50 UTC (rev 126486)
+++ Zope/trunk/src/ZPublisher/WSGIPublisher.py 2012-05-24 16:20:08 UTC (rev 126487)
@@ -30,6 +30,7 @@
from ZPublisher.Publish import dont_publish_class
from ZPublisher.Publish import get_module_info
from ZPublisher.Publish import missing_name
+from ZPublisher.pubevents import PubStart, PubBeforeCommit, PubAfterTraversal
from ZPublisher.Iterators import IStreamIterator
_NOW = None # overwrite for testing
@@ -149,6 +150,7 @@
# return ''
raise NotImplementedError
+
def publish(request, module_name,
_get_module_info=get_module_info, # only for testing
):
@@ -160,8 +162,9 @@
err_hook,
validated_hook,
transactions_manager,
- )= _get_module_info(module_name)
+ ) = _get_module_info(module_name)
+ notify(PubStart(request))
request.processInputs()
response = request.response
@@ -181,8 +184,9 @@
# According to RFC1738 a trailing space in the path is valid.
path = request.get('PATH_INFO')
- request['PARENTS'] = parents = [object]
+ request['PARENTS'] = [object]
object = request.traverse(path, validated_hook=validated_hook)
+ notify(PubAfterTraversal(request))
if transactions_manager:
transactions_manager.recordMetaData(object, request)
@@ -201,8 +205,10 @@
if result is not response:
response.setBody(result)
+ notify(PubBeforeCommit(request))
return response
+
class _RequestCloserForTransaction(object):
"""Unconditionally close the request at the end of a transaction.
More information about the Zope-Checkins
mailing list