summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-12-07 22:10:32 -0500
committerChris McDonough <chrism@plope.com>2010-12-07 22:10:32 -0500
commit1b6fd9e52310201eb8e637d3deb225da64dfc371 (patch)
tree87b63ee12685f9c25ce11adc707a97582683b681
parent9175e9a5a6f62076a038327a2c9d0fe297d1ba60 (diff)
downloadpyramid-1b6fd9e52310201eb8e637d3deb225da64dfc371.tar.gz
pyramid-1b6fd9e52310201eb8e637d3deb225da64dfc371.tar.bz2
pyramid-1b6fd9e52310201eb8e637d3deb225da64dfc371.zip
remove stray import
-rw-r--r--pyramid/tests/test_configuration.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/pyramid/tests/test_configuration.py b/pyramid/tests/test_configuration.py
index 3edddb8e9..aae0faffe 100644
--- a/pyramid/tests/test_configuration.py
+++ b/pyramid/tests/test_configuration.py
@@ -3468,7 +3468,6 @@ class ConfiguratorTests(unittest.TestCase):
self.assertRaises(ConfigurationConflictError, config.commit)
def test_commit_conflict_resolved_with_two_includes_and_local(self):
- from zope.configuration.config import ConfigurationConflictError
config = self._makeOne()
def view1(request): pass
def view2(request): pass