diff options
| -rw-r--r-- | pyramid/scripts/pshell.py | 2 | ||||
| -rw-r--r-- | pyramid/tests/test_scripts.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pyramid/scripts/pshell.py b/pyramid/scripts/pshell.py index 85c7e16ea..12215bedb 100644 --- a/pyramid/scripts/pshell.py +++ b/pyramid/scripts/pshell.py @@ -113,7 +113,7 @@ class PShellCommand(object): setup(env) # remove any objects from default help that were overidden - for k, v in env.iteritems(): + for k, v in env.items(): if k not in orig_env or env[k] != orig_env[k]: env_help[k] = v diff --git a/pyramid/tests/test_scripts.py b/pyramid/tests/test_scripts.py index c70b91908..c76839f80 100644 --- a/pyramid/tests/test_scripts.py +++ b/pyramid/tests/test_scripts.py @@ -979,8 +979,8 @@ class DummyConfigParser(object): def items(self, section): self.section = section if self.result is None: - from ConfigParser import NoSectionError - raise NoSectionError(section) + from pyramid.compat import configparser + raise configparser.NoSectionError(section) return self.result class DummyConfigParserFactory(object): |