From 64fb18e1921d18c8801e85bf8fc429a4be2160e9 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Sat, 6 Mar 2010 14:43:34 +0000 Subject: [PATCH] Fix TypeError on usage() when using regrtest switches which are not compatible. --- Lib/test/regrtest.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index c2a279fba30..832228175e6 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -162,6 +162,7 @@ import tempfile import platform import sysconfig + # Some times __path__ and __file__ are not absolute (e.g. while running from # Lib/) and, if we change the CWD to run the tests in a temporary dir, some # imports might fail. This affects only the modules imported before os.chdir(). @@ -385,9 +386,9 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, if single and fromfile: usage("-s and -f don't go together!") if use_mp and trace: - usage(2, "-T and -j don't go together!") + usage("-T and -j don't go together!") if use_mp and findleaks: - usage(2, "-l and -j don't go together!") + usage("-l and -j don't go together!") if use_mp and max(sys.flags): # TODO: inherit the environment and the flags print("Warning: flags and environment variables are ignored with -j option")