wip : test not patching WSGIPublisher as it is a backport from Zope4

product/ERP5/bin/zopewsgi.py

@@ -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

@@ -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

@@ -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__]