Commit 30b54fd5 authored by Hanno Schlichting's avatar Hanno Schlichting

Forward port c126486 from 2.13 branch

parent de366b28
......@@ -30,6 +30,7 @@ from ZPublisher.Publish import call_object
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 @@ class WSGIResponse(HTTPResponse):
# return ''
raise NotImplementedError
def publish(request, module_name,
_get_module_info=get_module_info, # only for testing
):
......@@ -160,8 +162,9 @@ def publish(request, module_name,
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 @@ def publish(request, module_name,
# 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 @@ def publish(request, module_name,
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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment