Merge pull request #323 from plone/plonezope4

Fix imports from Globals that was removed in Zope4
plone · Jan 31, 2017 · 78914c9 · 78914c9 · jenkins-plone-org · Jan 31, 2017
2 parents f25a2f3 + 16f30c4
commit 78914c9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
@@ -17,6 +17,9 @@ Bug fixes:
 - Support user.get_roles for anonymous users. Refs #339
   [jaroel]
 
+- Fix imports from Globals that was removed in Zope4
+  [pbauer]
+
 
 1.5.1 (2016-12-06)
 ------------------

diff --git a/src/plone/api/env.py b/src/plone/api/env.py
@@ -2,6 +2,7 @@
 from AccessControl.SecurityManagement import getSecurityManager
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import setSecurityManager
+from App.config import getConfiguration
 from contextlib import contextmanager
 from pkg_resources import get_distribution
 from plone.api import portal
@@ -12,7 +13,6 @@
 from plone.api.validation import required_parameters
 from zope.globalrequest import getRequest
 
-import Globals
 import traceback
 
 
@@ -181,7 +181,7 @@ def debug_mode():
 
     :Example: :ref:`env_debug_mode_example`
     """
-    return Globals.DevelopmentMode
+    return getConfiguration().debug_mode
 
 
 def test_mode():

diff --git a/src/plone/api/portal.py b/src/plone/api/portal.py
@@ -52,7 +52,11 @@
 ):
     PRINTINGMAILHOST_ENABLED = True
 else:
-    PRINTINGMAILHOST_ENABLED = False
+    # PrintingMailHost only patches in debug mode.
+    # plone.api.env.debug_mode cannot be used here, because .env imports this
+    # file
+    from App.config import getConfiguration
+    PRINTINGMAILHOST_ENABLED = getConfiguration().debug_mode
 
 MISSING = object()
 

diff --git a/src/plone/api/tests/test_env.py b/src/plone/api/tests/test_env.py
@@ -8,7 +8,6 @@
 from plone.app.testing import TEST_USER_ID
 
 import AccessControl
-import Globals
 import unittest
 
 
@@ -51,7 +50,7 @@ def private_method(self):
         pass
 
 
-Globals.InitializeClass(HasProtectedMethods)
+AccessControl.class_init.InitializeClass(HasProtectedMethods)
 
 
 class TestPloneApiEnv(unittest.TestCase):
@@ -389,12 +388,13 @@ def test_argument_requirement(self):
             api.env.adopt_roles()
 
     def test_debug_mode(self):
-        """Tests that returned value is the same as Globals.DevelopmentMode."""
+        """Tests that the retured value is the same as
+        getConfiguration.debug_mode."""
         from plone.api.env import debug_mode
-        import Globals
-        Globals.DevelopmentMode = True
+        from App.config import getConfiguration
+        getConfiguration().debug_mode = True
         self.assertEqual(debug_mode(), True)
-        Globals.DevelopmentMode = False
+        getConfiguration().debug_mode = False
         self.assertEqual(debug_mode(), False)
 
     def test_test_mode(self):