Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
138
Merge Requests
138
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
2e336f3b
Commit
2e336f3b
authored
Apr 13, 2021
by
Aurel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wip : test not patching WSGIPublisher as it is a backport from Zope4
parent
1da6c053
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
product/ERP5/bin/zopewsgi.py
product/ERP5/bin/zopewsgi.py
+1
-1
product/ERP5Type/ZopePatch.py
product/ERP5Type/ZopePatch.py
+1
-1
product/ERP5Type/patches/WSGIPublisher.py
product/ERP5Type/patches/WSGIPublisher.py
+2
-2
No files found.
product/ERP5/bin/zopewsgi.py
View file @
2e336f3b
...
...
@@ -15,7 +15,7 @@ import ZConfig
import
Zope2
from
Zope2.Startup.run
import
make_wsgi_app
from
Products.ERP5Type.patches
.WSGIPublisher
import
publish_module
from
ZPublisher
.WSGIPublisher
import
publish_module
# this class licensed under the MIT license (stolen from pyramid_translogger)
...
...
product/ERP5Type/ZopePatch.py
View file @
2e336f3b
...
...
@@ -21,7 +21,7 @@
##############################################################################
# Load all monkey patches
from
Products.ERP5Type.patches
import
WSGIPublisher
#
from Products.ERP5Type.patches import WSGIPublisher
from
Products.ERP5Type.patches
import
HTTPRequest
from
Products.ERP5Type.patches
import
AccessControl_patch
from
Products.ERP5Type.patches
import
Restricted
...
...
product/ERP5Type/patches/WSGIPublisher.py
View file @
2e336f3b
...
...
@@ -388,7 +388,7 @@ def load_app(module_info):
try
:
yield
(
app
,
realm
,
debug_mode
,
validated_hook
)
finally
:
if
transaction
.
manager
.
_txn
is
not
None
:
if
getattr
(
transaction
.
manager
,
'_txn'
,
None
)
is
not
None
:
# Only abort a transaction, if one exists. Otherwise the
# abort creates a new transaction just to abort it.
transaction
.
abort
()
...
...
@@ -470,4 +470,4 @@ def publish_module(environ, start_response,
return
result
sys
.
modules
[
'ZPublisher.WSGIPublisher'
]
=
sys
.
modules
[
__name__
]
#
sys.modules['ZPublisher.WSGIPublisher'] = sys.modules[__name__]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment