test reapplying wsgi patches

product/ERP5Type/ZopePatch.py

@@ -23,11 +23,7 @@
 from Products.ERP5Type import WITH_LEGACY_WORKFLOW
 
 # Load all monkey patches
-try:
-  from ZPublisher.WSGIPublisher import _MODULES
-except ImportError:
-  # BBB Zope2
-  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

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