diff options
| author | Chris McDonough <chrism@plope.com> | 2011-10-09 01:31:32 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-10-09 01:31:32 -0400 |
| commit | fa043a249870d8f5e7dbd4586b633a7ce8f3518b (patch) | |
| tree | e1bec16100d38f026c88629b6168b2e0f157cb4a | |
| parent | 3be1baf1e32b8b7eed4b683ccd3269a7bc8f063d (diff) | |
| download | pyramid-fa043a249870d8f5e7dbd4586b633a7ce8f3518b.tar.gz pyramid-fa043a249870d8f5e7dbd4586b633a7ce8f3518b.tar.bz2 pyramid-fa043a249870d8f5e7dbd4586b633a7ce8f3518b.zip | |
we no longer support 2.4 or 2.5
| -rw-r--r-- | pyramid/scaffolds/tests.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pyramid/scaffolds/tests.py b/pyramid/scaffolds/tests.py index 132177187..2fa0ccd67 100644 --- a/pyramid/scaffolds/tests.py +++ b/pyramid/scaffolds/tests.py @@ -64,12 +64,7 @@ class TemplateTest(object): else: assert not toolbarchunk in data, ininame finally: - if hasattr(proc, 'terminate'): - # 2.6+ - proc.terminate() - else: - # 2.5 - os.kill(proc.pid, signal.SIGTERM) + proc.terminate() finally: shutil.rmtree(self.directory) os.chdir(self.old_cwd) @@ -77,7 +72,7 @@ class TemplateTest(object): if __name__ == '__main__': # pragma: no cover templates = ['starter', 'alchemy', 'routesalchemy',] - if sys.version_info >= (2, 5) and sys.version_info < (3, 0): + if sys.version_info >= (2, 6) and sys.version_info < (3, 0): templates.append('zodb') for name in templates: |