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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
erp5
Commits
c0d75589
Commit
c0d75589
authored
Sep 27, 2021
by
Aurel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
_txn is not store at the same place in zope4
parent
699bdef2
Changes
1
Hide 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 @
c0d75589
...
@@ -53,7 +53,12 @@ from ZPublisher.mapply import mapply
...
@@ -53,7 +53,12 @@ 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
,
)
else
:
else
:
...
@@ -388,10 +393,17 @@ def load_app(module_info):
...
@@ -388,10 +393,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
getattr
(
transaction
.
manager
,
'_txn'
,
None
)
is
not
None
:
if
isZope4
:
# Only abort a transaction, if one exists. Otherwise the
if
transaction
.
manager
.
manager
.
_txn
is
not
None
:
# abort creates a new transaction just to abort it.
# Only abort a transaction, if one exists. Otherwise the
transaction
.
abort
()
# abort creates a new transaction just to abort it.
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