summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pytest.py2
-rw-r--r--textutils.py5
2 files changed, 2 insertions, 5 deletions
diff --git a/pytest.py b/pytest.py
index 10b19f7..f800e9e 100644
--- a/pytest.py
+++ b/pytest.py
@@ -277,7 +277,7 @@ class PyTester(object):
ttime, ctime = (tend - tstart), (cend - cstart)
self.report.feed(filename, testprog.result, ttime, ctime)
return testprog
- except SystemExit:
+ except (KeyboardInterrupt, SystemExit):
raise
except Exception, exc:
self.report.failed_to_test_module(filename)
diff --git a/textutils.py b/textutils.py
index bc22ad5..cf73f8d 100644
--- a/textutils.py
+++ b/textutils.py
@@ -1,6 +1,3 @@
-# Copyright (c) 2003-2006 LOGILAB S.A. (Paris, FRANCE).
-# http://www.logilab.fr/ -- mailto:contact@logilab.fr
-#
# This program is free software; you can redistribute it and/or modify it under
# the terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
@@ -16,7 +13,7 @@
"""Some text manipulation utility functions.
:author: Logilab
-:copyright: 2003-2006 LOGILAB S.A. (Paris, FRANCE)
+:copyright: 2003-2007 LOGILAB S.A. (Paris, FRANCE)
:contact: http://www.logilab.fr/ -- mailto:python-projects@logilab.org
:group text formatting: normalize_text, normalize_paragraph, pretty_match,\