summaryrefslogtreecommitdiff
path: root/src/zope/security/tests/test_zcml_functest.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/zope/security/tests/test_zcml_functest.py')
-rw-r--r--src/zope/security/tests/test_zcml_functest.py9
1 files changed, 4 insertions, 5 deletions
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 = ('''<class class="%s">
<require
attributes="m1"/>
</class>'''
% (_pfx("test_class")))
- self.assertRaises(ZopeXMLConfigurationError,
- self.assertDeclaration,
- declaration)
+ with self.assertRaises(ConfigurationError):
+ self.assertDeclaration(declaration)
def testCompositeMethodsPluralElementPerm(self):