From fa043a249870d8f5e7dbd4586b633a7ce8f3518b Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 9 Oct 2011 01:31:32 -0400 Subject: we no longer support 2.4 or 2.5 --- pyramid/scaffolds/tests.py | 9 ++------- 1 file 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: -- cgit v1.2.3