From a294cdfef34cda587d288a457c9a2e7bf760e916 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@agendaless.com>
Date: Wed, 9 Dec 2009 01:21:21 +0000
Subject: - The exception class representing the error raised by various
 methods   of a ``Configurator`` is now importable as  
 ``repoze.bfg.exceptions.ConfigurationError``.

---
 repoze/bfg/tests/test_configuration.py | 20 ++++++++++----------
 repoze/bfg/tests/test_zcml.py          |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'repoze/bfg/tests')

diff --git a/repoze/bfg/tests/test_configuration.py b/repoze/bfg/tests/test_configuration.py
index 4523fe463..2e2283ab4 100644
--- a/repoze/bfg/tests/test_configuration.py
+++ b/repoze/bfg/tests/test_configuration.py
@@ -126,7 +126,7 @@ class ConfiguratorTests(unittest.TestCase):
         self.assertEqual(policy, result)
 
     def test_ctor_authorization_policy_only(self):
-        from zope.configuration.exceptions import ConfigurationError
+        from repoze.bfg.exceptions import ConfigurationError
         policy = object()
         self.assertRaises(ConfigurationError,
                           self._makeOne, authorization_policy=policy)
@@ -187,7 +187,7 @@ class ConfiguratorTests(unittest.TestCase):
 
     def test_setup_registry_authorization_policy_only(self):
         from repoze.bfg.registry import Registry
-        from zope.configuration.exceptions import ConfigurationError
+        from repoze.bfg.exceptions import ConfigurationError
         policy = object()
         reg = Registry()
         config = self._makeOne(reg)
@@ -337,12 +337,12 @@ class ConfiguratorTests(unittest.TestCase):
         self.assertEqual(dummylock.released, True)
 
     def test_add_view_view_callable_None_no_renderer(self):
-        from zope.configuration.exceptions import ConfigurationError
+        from repoze.bfg.exceptions import ConfigurationError
         config = self._makeOne()
         self.assertRaises(ConfigurationError, config.add_view)
 
     def test_add_view_with_request_type_and_route_name(self):
-        from zope.configuration.exceptions import ConfigurationError
+        from repoze.bfg.exceptions import ConfigurationError
         config = self._makeOne()
         view = lambda *arg: 'OK'
         self.assertRaises(ConfigurationError, config.add_view, view, '', None,
@@ -797,7 +797,7 @@ class ConfiguratorTests(unittest.TestCase):
         self._assertNotFound(wrapper, None, request)
 
     def test_add_view_with_header_badregex(self):
-        from zope.configuration.exceptions import ConfigurationError
+        from repoze.bfg.exceptions import ConfigurationError
         view = lambda *arg: 'OK'
         config = self._makeOne()
         self.assertRaises(ConfigurationError,
@@ -876,7 +876,7 @@ class ConfiguratorTests(unittest.TestCase):
         self._assertNotFound(wrapper, context, None)
 
     def test_add_view_with_path_info_badregex(self):
-        from zope.configuration.exceptions import ConfigurationError
+        from repoze.bfg.exceptions import ConfigurationError
         view = lambda *arg: 'OK'
         config = self._makeOne()
         self.assertRaises(ConfigurationError,
@@ -1229,7 +1229,7 @@ class ConfiguratorTests(unittest.TestCase):
         self.assertEqual(wrapped(None, request).__class__, StaticURLParser)
 
     def test__system_view_no_view_no_renderer(self):
-        from zope.configuration.exceptions import ConfigurationError
+        from repoze.bfg.exceptions import ConfigurationError
         config = self._makeOne()
         self.assertRaises(ConfigurationError, config._system_view, IDummy)
 
@@ -1616,18 +1616,18 @@ class ConfiguratorTests(unittest.TestCase):
         self.assertRaises(ValueError, wrapped, None, request)
 
     def test_override_resource_samename(self):
-        from zope.configuration.exceptions import ConfigurationError
+        from repoze.bfg.exceptions import ConfigurationError
         config = self._makeOne()
         self.assertRaises(ConfigurationError, config.override_resource,'a', 'a')
 
     def test_override_resource_directory_with_file(self):
-        from zope.configuration.exceptions import ConfigurationError
+        from repoze.bfg.exceptions import ConfigurationError
         config = self._makeOne()
         self.assertRaises(ConfigurationError, config.override_resource,
                           'a:foo/', 'a:foo.pt')
 
     def test_override_resource_file_with_directory(self):
-        from zope.configuration.exceptions import ConfigurationError
+        from repoze.bfg.exceptions import ConfigurationError
         config = self._makeOne()
         self.assertRaises(ConfigurationError, config.override_resource,
                           'a:foo.pt', 'a:foo/')
diff --git a/repoze/bfg/tests/test_zcml.py b/repoze/bfg/tests/test_zcml.py
index 148b8cac6..f3e0ed80f 100644
--- a/repoze/bfg/tests/test_zcml.py
+++ b/repoze/bfg/tests/test_zcml.py
@@ -167,7 +167,7 @@ class TestSystemViewHandler(unittest.TestCase):
 
     def test_no_view_no_renderer(self):
         handler = self._makeOne(IDummy)
-        from zope.configuration.exceptions import ConfigurationError
+        from repoze.bfg.exceptions import ConfigurationError
         context = DummyContext()
         handler(context)
         actions = context.actions
@@ -358,7 +358,7 @@ class TestAuthTktAuthenticationPolicyDirective(unittest.TestCase):
         self.assertEqual(policy.callback, callback)
 
     def test_it_configerror(self):
-        from zope.configuration.exceptions import ConfigurationError
+        from repoze.bfg.exceptions import ConfigurationError
         context = DummyContext()
         def callback(identity, request):
             """ """
-- 
cgit v1.2.3