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
288ee5d3
Commit
288ee5d3
authored
Sep 27, 2021
by
Aurel
Committed by
Arnaud Fontaine
Mar 01, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
_txn is not store at the same place in zope4
parent
b4f6e09e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
5 deletions
+17
-5
product/ERP5Type/patches/WSGIPublisher.py
product/ERP5Type/patches/WSGIPublisher.py
+17
-5
No files found.
product/ERP5Type/patches/WSGIPublisher.py
View file @
288ee5d3
...
@@ -54,6 +54,11 @@ from ZPublisher.mapply import mapply
...
@@ -54,6 +54,11 @@ from ZPublisher.mapply import mapply
from
ZPublisher.WSGIPublisher
import
call_object
from
ZPublisher.WSGIPublisher
import
call_object
from
ZPublisher.WSGIPublisher
import
missing_name
,
WSGIResponse
from
ZPublisher.WSGIPublisher
import
missing_name
,
WSGIResponse
try
:
from
ZServer.ZPublisher
import
Publish
isZope4
=
True
except
ImportError
:
isZope4
=
False
if
sys
.
version_info
>=
(
3
,
):
if
sys
.
version_info
>=
(
3
,
):
_FILE_TYPES
=
(
IOBase
,
)
_FILE_TYPES
=
(
IOBase
,
)
...
@@ -411,10 +416,17 @@ def load_app(module_info):
...
@@ -411,10 +416,17 @@ def load_app(module_info):
try
:
try
:
yield
(
app
,
realm
,
debug_mode
,
validated_hook
)
yield
(
app
,
realm
,
debug_mode
,
validated_hook
)
finally
:
finally
:
if
transaction
.
manager
.
_txn
is
not
None
:
if
isZope4
:
if
transaction
.
manager
.
manager
.
_txn
is
not
None
:
# Only abort a transaction, if one exists. Otherwise the
# Only abort a transaction, if one exists. Otherwise the
# abort creates a new transaction just to abort it.
# abort creates a new transaction just to abort it.
transaction
.
abort
()
transaction
.
abort
()
else
:
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
()
app
.
_p_jar
.
close
()
app
.
_p_jar
.
close
()
...
...
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