diff options
Diffstat (limited to 'src/zope/security/tests')
| -rw-r--r-- | src/zope/security/tests/test_checker.py | 13 | ||||
| -rw-r--r-- | src/zope/security/tests/test_management.py | 14 | ||||
| -rw-r--r-- | src/zope/security/tests/test_metaconfigure.py | 17 | ||||
| -rw-r--r-- | src/zope/security/tests/test_proxy.py | 6 | ||||
| -rw-r--r-- | src/zope/security/tests/test_zcml_functest.py | 36 |
5 files changed, 31 insertions, 55 deletions
diff --git a/src/zope/security/tests/test_checker.py b/src/zope/security/tests/test_checker.py index b82799f..56a03ff 100644 --- a/src/zope/security/tests/test_checker.py +++ b/src/zope/security/tests/test_checker.py @@ -838,13 +838,12 @@ class _SelectCheckerBase(object): def test_w_basic_types_NoProxy(self): import datetime from zope.i18nmessageid import Message - from zope.security._compat import _u msg = Message('msg') for obj in [object(), 42, 3.14, None, - _u('text'), + u'text', b'binary', msg, True, @@ -966,13 +965,12 @@ class Test_defineChecker(unittest.TestCase): return defineChecker(type_, checker) def test_w_wrong_type(self): - from zope.security._compat import _u checker = object() for obj in [object(), 42, 3.14, None, - _u('text'), + u'text', b'binary', True, ]: @@ -2030,11 +2028,10 @@ class Test(unittest.TestCase): class TestCheckerPublic(unittest.TestCase): def test_that_pickling_CheckerPublic_retains_identity(self): - from zope.security._compat import _pickle + import pickle from zope.security.checker import CheckerPublic - self.assertTrue(_pickle.loads(_pickle.dumps(CheckerPublic)) - is - CheckerPublic) + self.assertIs(pickle.loads(pickle.dumps(CheckerPublic)), + CheckerPublic) def test_that_CheckerPublic_identity_works_even_when_proxied(self): from zope.security.checker import ProxyFactory diff --git a/src/zope/security/tests/test_management.py b/src/zope/security/tests/test_management.py index 8eee32b..83aca7b 100644 --- a/src/zope/security/tests/test_management.py +++ b/src/zope/security/tests/test_management.py @@ -172,17 +172,15 @@ class Test(unittest.TestCase): def test_system_user(self): from zope.security.management import system_user - from zope.security._compat import TEXT - from zope.security._compat import _u + self.assertEqual(system_user.id, - _u('zope.security.management.system_user')) + u'zope.security.management.system_user') - self.assertEqual(system_user.title, _u('System')) + self.assertEqual(system_user.title, u'System') for name in 'id', 'title', 'description': - self.assertTrue(isinstance(getattr(system_user, name), TEXT)) + self.assertIsInstance(getattr(system_user, name), + type(u'')) def test_suite(): - return unittest.TestSuite(( - unittest.makeSuite(Test), - )) + return unittest.defaultTestLoader.loadTestsFromName(__name__) diff --git a/src/zope/security/tests/test_metaconfigure.py b/src/zope/security/tests/test_metaconfigure.py index 934d034..3998268 100644 --- a/src/zope/security/tests/test_metaconfigure.py +++ b/src/zope/security/tests/test_metaconfigure.py @@ -218,10 +218,9 @@ class ClassDirectiveTests(unittest.TestCase): from zope.schema import Field from zope.interface import Interface from zope.security.protectclass import protectSetAttribute - from zope.security._compat import _u class IFoo(Interface): - bar = Field(_u("Bar")) - baz = Field(_u("Baz")) + bar = Field(u"Bar") + baz = Field(u"Baz") context = DummyZCMLContext() directive = self._makeOne(context, Foo) directive.require(context, permission='testing', set_schema=[IFoo]) @@ -258,9 +257,8 @@ class ClassDirectiveTests(unittest.TestCase): from zope.component.interface import provideInterface from zope.schema import Field from zope.interface import Interface - from zope.security._compat import _u class IFoo(Interface): - bar = Field(_u("Bar"), readonly=True) + bar = Field(u"Bar", readonly=True) context = DummyZCMLContext() directive = self._makeOne(context, Foo) directive.require(context, permission='testing', set_schema=[IFoo]) @@ -650,11 +648,4 @@ class DummyZCMLContext(object): def test_suite(): - return unittest.TestSuite([ - unittest.makeSuite(Test_dottedName), - unittest.makeSuite(ClassDirectiveTests), - unittest.makeSuite(Test_protectModule), - unittest.makeSuite(Test_allow), - unittest.makeSuite(Test_allow), - ]) - + return unittest.defaultTestLoader.loadTestsFromName(__name__) diff --git a/src/zope/security/tests/test_proxy.py b/src/zope/security/tests/test_proxy.py index ca4a8a3..62d6a83 100644 --- a/src/zope/security/tests/test_proxy.py +++ b/src/zope/security/tests/test_proxy.py @@ -1957,7 +1957,11 @@ class LocationProxySecurityCheckerTests(unittest.TestCase): import sys from zope.location.location import LocationProxy import zope.security - from zope.security._compat import reload + try: + from imp import reload + except ImportError: + reload = reload # Python 2 + # This attribute is set when zope.security.decorator is imported, to # show that it will be set too, if zope.security.proxy is imported # we set it to a different value at first: diff --git a/src/zope/security/tests/test_zcml_functest.py b/src/zope/security/tests/test_zcml_functest.py index 5f79fae..b932734 100644 --- a/src/zope/security/tests/test_zcml_functest.py +++ b/src/zope/security/tests/test_zcml_functest.py @@ -14,24 +14,19 @@ """Directives Tests """ import unittest - +import io def _skip_wo_zope_configuration(testfunc): try: import zope.configuration.xmlconfig except ImportError: - from functools import update_wrapper - def dummy(self): - pass - update_wrapper(dummy, testfunc) - return dummy + return unittest.skip("No zope.configuration")(testfunc) else: return testfunc def configfile(s): - from zope.security._compat import StringIO - return StringIO("""<configure + return io.StringIO(u"""<configure xmlns='http://namespaces.zope.org/zope' i18n_domain='zope'> %s @@ -270,11 +265,10 @@ class Context(object): self.actions += ((discriminator, callable, args), ) def __repr__(self): - from zope.security._compat import StringIO import re import pprint atre = re.compile(' at [0-9a-fA-Fx]+') - stream = StringIO() + stream = io.StringIO() if bytes is not str else io.BytesIO() pprinter = pprint.PrettyPrinter(stream=stream, width=60) pprinter.pprint(self.actions) r = stream.getvalue() @@ -339,19 +333,18 @@ def _pfx(name): return module.__name__ + '.' + name def defineDirectives(): - from zope.security._compat import StringIO from zope.configuration.xmlconfig import XMLConfig from zope.configuration.xmlconfig import xmlconfig import zope.security XMLConfig('meta.zcml', zope.security)() - xmlconfig(StringIO("""<configure + xmlconfig(io.StringIO(u"""<configure xmlns='http://namespaces.zope.org/zope' i18n_domain='zope'> <permission id="zope.Extravagant" title="extravagant" /> <permission id="zope.Paltry" title="paltry" /> </configure>""")) -NOTSET = [] +NOTSET = () P1 = "zope.Extravagant" P2 = "zope.Paltry" @@ -655,19 +648,19 @@ class TestRequireDirective(unittest.TestCase): def apply_declaration(declaration): '''Apply the xmlconfig machinery.''' - from zope.security._compat import StringIO from zope.configuration.xmlconfig import xmlconfig - return xmlconfig(StringIO(declaration)) + if isinstance(declaration, bytes): + declaration = declaration.decode("utf-8") + return xmlconfig(io.StringIO(declaration)) @_skip_wo_zope_configuration def make_dummy(): from zope.interface import Interface import zope.security.zcml - from zope.security._compat import _u global IDummy class IDummy(Interface): - perm = zope.security.zcml.Permission(title=_u('')) + perm = zope.security.zcml.Permission(title=u'') perms = [] @@ -706,11 +699,4 @@ class DirectivesTest(unittest.TestCase): def test_suite(): - - return unittest.TestSuite(( - unittest.makeSuite(TestClassDirective), - unittest.makeSuite(TestFactorySubdirective), - unittest.makeSuite(TestFactoryDirective), - unittest.makeSuite(TestRequireDirective), - unittest.makeSuite(DirectivesTest), - )) + return unittest.defaultTestLoader.loadTestsFromName(__name__) |