Skip to content

Commit

Permalink
Fix sort order of imports
Browse files Browse the repository at this point in the history
modified:   src/Products/PythonScripts/tests/testBindings.py
modified:   src/Products/PythonScripts/tests/testPythonScript.py
  • Loading branch information
jugmac00 committed Jul 15, 2020
1 parent fe094af commit a687042
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/Products/PythonScripts/tests/testBindings.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ def setUp(self):
self.connection = self.db.open()

def tearDown(self):
from Testing.ZODButil import cleanDB
from AccessControl.SecurityManagement import noSecurityManager
from Testing.ZODButil import cleanDB
noSecurityManager()
transaction.abort()
self.connection.close()
Expand Down Expand Up @@ -189,8 +189,8 @@ def test_bound_unused_container(self):
self.assertEqual(ps(), 1)

def test_bound_used_container(self):
from AccessControl.SecurityManagement import newSecurityManager
from AccessControl import Unauthorized
from AccessControl.SecurityManagement import newSecurityManager
newSecurityManager(None, UnderprivilegedUser())
root = self._makeTree()
guarded = root._getOb('guarded')
Expand Down Expand Up @@ -241,8 +241,8 @@ def test_bound_unused_context(self):
self.assertEqual(ps(), 1)

def test_bound_used_context(self):
from AccessControl.SecurityManagement import newSecurityManager
from AccessControl import Unauthorized
from AccessControl.SecurityManagement import newSecurityManager
newSecurityManager(None, UnderprivilegedUser())
root = self._makeTree()
guarded = root._getOb('guarded')
Expand Down Expand Up @@ -303,8 +303,8 @@ def test_ok_no_bindings(self):
self.assertEqual(boundless_ps(), 42)

def test_bound_used_context_method_w_roles(self):
from AccessControl.SecurityManagement import newSecurityManager
from AccessControl import Unauthorized
from AccessControl.SecurityManagement import newSecurityManager
newSecurityManager(None, UnderprivilegedUser())
root = self._makeTree()
guarded = root._getOb('guarded')
Expand Down
4 changes: 2 additions & 2 deletions src/Products/PythonScripts/tests/testPythonScript.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,17 @@ class PythonScriptTestBase(unittest.TestCase):

def setUp(self):
from AccessControl import ModuleSecurityInfo
from AccessControl.SecurityInfo import _moduleSecurity
from AccessControl.SecurityInfo import _appliedModuleSecurity
from AccessControl.SecurityInfo import _moduleSecurity
self._ms_before = _moduleSecurity.copy()
self._ams_before = _appliedModuleSecurity.copy()
ModuleSecurityInfo('string').declarePublic('split') # noqa: D001
ModuleSecurityInfo('sets').declarePublic('Set') # noqa: D001
newSecurityManager(None, None)

def tearDown(self):
from AccessControl.SecurityInfo import _moduleSecurity
from AccessControl.SecurityInfo import _appliedModuleSecurity
from AccessControl.SecurityInfo import _moduleSecurity
noSecurityManager()
_moduleSecurity.clear()
_moduleSecurity.update(self._ms_before)
Expand Down

0 comments on commit a687042

Please sign in to comment.