From d4a66177d040697133fd6a1e55ba328f24c0a9c4 Mon Sep 17 00:00:00 2001 From: Jason Madden Date: Fri, 19 Oct 2018 07:12:50 -0500 Subject: Fix tests and DeprecationWarnings. Fixes #55 --- src/zope/security/tests/test_proxy.py | 21 ++++++++++++--------- src/zope/security/tests/test_zcml_functest.py | 9 ++++----- 2 files changed, 16 insertions(+), 14 deletions(-) (limited to 'src/zope') diff --git a/src/zope/security/tests/test_proxy.py b/src/zope/security/tests/test_proxy.py index 16bc98a..55d6d43 100644 --- a/src/zope/security/tests/test_proxy.py +++ b/src/zope/security/tests/test_proxy.py @@ -32,6 +32,9 @@ class AbstractProxyTestBase(object): # pylint:disable=no-member,blacklisted-name + assertRaisesRegex = getattr(unittest.TestCase, 'assertRaisesRegex', + unittest.TestCase.assertRaisesRegexp) + # The names of attributes that are spelled different on Py2 # vs Py3 itruediv = '__itruediv__' if not PYTHON2 else '__idiv__' @@ -97,7 +100,7 @@ class AbstractProxyTestBase(object): checker = DummyChecker() proxy = self._makeOne(target, checker) - with self.assertRaisesRegexp(AttributeError, "name"): + with self.assertRaisesRegex(AttributeError, "name"): getattr(proxy, 'name') self.assertEqual(1, target.count) @@ -1320,8 +1323,8 @@ class AbstractProxyTestBase(object): target = Get() checker = DummyChecker() proxy = self._makeOne(target, checker) - with self.assertRaisesRegexp(Missing, - self.getslice): + with self.assertRaisesRegex(Missing, + self.getslice): proxy[1:2] self.assertEqual(checker._checked, self.getslice) @@ -1336,8 +1339,8 @@ class AbstractProxyTestBase(object): target = Get() checker = DummyChecker() proxy = self._makeOne(target, checker) - with self.assertRaisesRegexp(Missing, - '__getitem__'): + with self.assertRaisesRegex(Missing, + '__getitem__'): proxy[1:2] self.assertEqual(checker._checked, self.getslice) @@ -1382,8 +1385,8 @@ class AbstractProxyTestBase(object): target = Set() checker = DummyChecker() proxy = self._makeOne(target, checker) - with self.assertRaisesRegexp(Missing, - self.setslice): + with self.assertRaisesRegex(Missing, + self.setslice): proxy[1:2] = 1 self.assertEqual(checker._checked, self.setslice) @@ -1398,8 +1401,8 @@ class AbstractProxyTestBase(object): target = Set() checker = DummyChecker() proxy = self._makeOne(target, checker) - with self.assertRaisesRegexp(Missing, - '__setitem__'): + with self.assertRaisesRegex(Missing, + '__setitem__'): proxy[1:2] = 1 self.assertEqual(checker._checked, self.setslice) diff --git a/src/zope/security/tests/test_zcml_functest.py b/src/zope/security/tests/test_zcml_functest.py index eee6d57..b669847 100644 --- a/src/zope/security/tests/test_zcml_functest.py +++ b/src/zope/security/tests/test_zcml_functest.py @@ -187,7 +187,7 @@ class TestFactorySubdirective(unittest.TestCase): def testFactoryNoId(self): from zope.component import getUtility from zope.component.interfaces import IFactory - from zope.component.interfaces import ComponentLookupError + from zope.interface.interfaces import ComponentLookupError from zope.configuration.xmlconfig import xmlconfig self._meta() f = configfile(""" @@ -481,15 +481,14 @@ class TestRequireDirective(unittest.TestCase): def testCompositeNoPerm(self): # Establish rejection of declarations lacking a permission spec. - from zope.configuration.xmlconfig import ZopeXMLConfigurationError + from zope.configuration.exceptions import ConfigurationError declaration = (''' ''' % (_pfx("test_class"))) - self.assertRaises(ZopeXMLConfigurationError, - self.assertDeclaration, - declaration) + with self.assertRaises(ConfigurationError): + self.assertDeclaration(declaration) def testCompositeMethodsPluralElementPerm(self): -- cgit v1.2.1