test reapplying wsgi patches

6f3b45fb · Aurel · 0de1f854 · 6f3b45fb · 6f3b45fb
Commit 6f3b45fb authored Sep 01, 2021 by Aurel
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 10 deletions

product/ERP5Type/ZopePatch.py product/ERP5Type/ZopePatch.py +1 -5

product/ERP5Type/patches/WSGIPublisher.py product/ERP5Type/patches/WSGIPublisher.py +1 -5

No files found.
--- a/product/ERP5Type/ZopePatch.py
+++ b/product/ERP5Type/ZopePatch.py
@@ -23,11 +23,7 @@
 from Products.ERP5Type import WITH_LEGACY_WORKFLOW
 # Load all monkey patches
-try:
+from Products.ERP5Type.patches import WSGIPublisher
-  from ZPublisher.WSGIPublisher import _MODULES
-except ImportError:
-  # BBB Zope2
-  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

--- a/product/ERP5Type/patches/WSGIPublisher.py
+++ b/product/ERP5Type/patches/WSGIPublisher.py
@@ -469,8 +469,4 @@ def publish_module(environ, start_response,
    # Return the result body iterable.
    return result
-try:
+sys.modules['ZPublisher.WSGIPublisher'] = sys.modules[__name__]
-  from ZPublisher.WSGIPublisher import _MODULES
-except ImportError:
-  # BBB Zope2
-  sys.modules['ZPublisher.WSGIPublisher'] = sys.modules[__name__]