Skip to content

Commit

Permalink
Merge branch 'master' into perrinjerome/macosxfails2
Browse files Browse the repository at this point in the history
  • Loading branch information
dataflake authored Nov 3, 2024
2 parents 1b40c56 + 27f3fcd commit c9f9d40
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 17 deletions.
8 changes: 8 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ https://github.com/zopefoundation/Zope/blob/4.x/CHANGES.rst
5.11.1 (unreleased)
-------------------

- Update to newest compatible versions of dependencies.

- Define ``request["PARENTS"]`` before request parameter processing
such that request failure subscribers (such as that of
``Products.SiteErrorLog``) can determine the error context
for exceptions raised during request parameter processing
(see `#1235 <https://github.com/zopefoundation/Zope/issues/1235>`_).


5.11 (2024-10-11)
-----------------
Expand Down
9 changes: 5 additions & 4 deletions constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ PasteDeploy==3.1.0
Persistence==5.1
RestrictedPython==7.4
WSGIProxy2==0.5.1
WebOb==1.8.8
WebOb==1.8.9
WebTest==3.0.1
ZConfig==4.1
ZODB==6.0
Expand All @@ -29,7 +29,8 @@ roman==4.2
six==1.16.0
soupsieve==2.6
transaction==5.0
waitress==3.0.0
waitress==3.0.0; python_version == '3.8'
waitress==3.0.1; python_version > '3.8'
z3c.pt==4.4
zExceptions==5.0
zc.lockfile==3.0.post1
Expand All @@ -51,13 +52,13 @@ zope.deferredimport==5.0
zope.deprecation==5.0
zope.dottedname==6.0
zope.event==5.0
zope.exceptions==5.1
zope.exceptions==5.2
zope.filerepresentation==6.0
zope.globalrequest==2.0
zope.hookable==7.0
zope.i18n==5.2
zope.i18nmessageid==7.0
zope.interface==7.1.0
zope.interface==7.1.1
zope.lifecycleevent==5.0
zope.location==5.0
zope.pagetemplate==5.1
Expand Down
9 changes: 5 additions & 4 deletions requirements-full.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ PasteDeploy==3.1.0
Persistence==5.1
RestrictedPython==7.4
WSGIProxy2==0.5.1
WebOb==1.8.8
WebOb==1.8.9
WebTest==3.0.1
ZConfig==4.1
ZODB==6.0
Expand All @@ -30,7 +30,8 @@ roman==4.2
six==1.16.0
soupsieve==2.6
transaction==5.0
waitress==3.0.0
waitress==3.0.0; python_version == '3.8'
waitress==3.0.1; python_version > '3.8'
z3c.pt==4.4
zExceptions==5.0
zc.lockfile==3.0.post1
Expand All @@ -52,13 +53,13 @@ zope.deferredimport==5.0
zope.deprecation==5.0
zope.dottedname==6.0
zope.event==5.0
zope.exceptions==5.1
zope.exceptions==5.2
zope.filerepresentation==6.0
zope.globalrequest==2.0
zope.hookable==7.0
zope.i18n==5.2
zope.i18nmessageid==7.0
zope.interface==7.1.0
zope.interface==7.1.1
zope.lifecycleevent==5.0
zope.location==5.0
zope.pagetemplate==5.1
Expand Down
3 changes: 1 addition & 2 deletions src/ZPublisher/WSGIPublisher.py
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ def transaction_pubevents(request, response, tm=transaction.manager):

def publish(request, module_info):
obj, realm, debug_mode = module_info
request['PARENTS'] = [obj]

request.processInputs()
response = request.response
Expand All @@ -264,8 +265,6 @@ def publish(request, module_info):
# Get the path list.
# According to RFC1738 a trailing space in the path is valid.
path = request.get('PATH_INFO')
request['PARENTS'] = [obj]

obj = request.traverse(path, validated_hook=validate_user)

# Set debug information from the active request on the open connection
Expand Down
10 changes: 6 additions & 4 deletions versions-prod.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Persistence = 5.1
RestrictedPython = 7.4
WebTest = 3.0.1
WSGIProxy2 = 0.5.1
WebOb = 1.8.8
WebOb = 1.8.9
ZConfig = 4.1
ZODB = 6.0
beautifulsoup4 = 4.12.3
Expand All @@ -33,7 +33,7 @@ six = 1.16.0
roman = 4.2
soupsieve = 2.6
transaction = 5.0
waitress = 3.0.0
waitress = 3.0.1
z3c.pt = 4.4
zExceptions = 5.0
zc.lockfile = 3.0.post1
Expand All @@ -55,13 +55,13 @@ zope.deferredimport = 5.0
zope.deprecation = 5.0
zope.dottedname = 6.0
zope.event = 5.0
zope.exceptions = 5.1
zope.exceptions = 5.2
zope.filerepresentation = 6.0
zope.globalrequest = 2.0
zope.hookable = 7.0
zope.i18n = 5.2
zope.i18nmessageid = 7.0
zope.interface = 7.1.0
zope.interface = 7.1.1
zope.lifecycleevent = 5.0
zope.location = 5.0
zope.pagetemplate = 5.1
Expand All @@ -85,3 +85,5 @@ zope.viewlet = 5.0
[versions:python38]
# Chameleon >= 4.5 requires Python 3.9
Chameleon = 4.4.4
# waitress >= 3.0.1 requires Python 3.9
waitress = 3.0.0
6 changes: 3 additions & 3 deletions versions.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ versions = versions
Babel = 2.16.0
Jinja2 = 3.1.4
Missing = 5.0
MarkupSafe = 3.0.1
MarkupSafe = 3.0.2
Products.BTreeFolder2 = 5.1
Products.ZCatalog = 7.1
Pygments = 2.18.0
Record = 4.1
Sphinx = 8.0.2
Sphinx = 8.1.3
alabaster = 1.0.0
certifi = 2024.8.30
charset-normalizer = 3.4.0
Expand Down Expand Up @@ -45,7 +45,7 @@ urllib3 = 2.2.3
z3c.checkversions = 2.1
zc.recipe.testrunner = 3.1
zipp = 3.20.2
zope.testrunner = 6.5
zope.testrunner = 6.6

[versions:python39]
# Sphinx <8 requires alabaster <1
Expand Down

0 comments on commit c9f9d40

Please sign in to comment.