diff options
| author | Chris McDonough <chrism@plope.com> | 2011-10-05 09:26:36 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-10-05 09:26:36 -0400 |
| commit | 9344609a3a8c4d2e72caf8d7849d6fd2f372c43c (patch) | |
| tree | f0af79f615ed555832285b8892e1210254d616f0 | |
| parent | 338cb9482bd6dae479eded3a537f1edb7f6b9791 (diff) | |
| download | pyramid-9344609a3a8c4d2e72caf8d7849d6fd2f372c43c.tar.gz pyramid-9344609a3a8c4d2e72caf8d7849d6fd2f372c43c.tar.bz2 pyramid-9344609a3a8c4d2e72caf8d7849d6fd2f372c43c.zip | |
make pass on py3
| -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): |