[Python-checkins] r78727 - python/branches/py3k/Lib/test/regrtest.py
florent.xicluna
python-checkins at python.org
Sat Mar 6 15:43:34 CET 2010
Author: florent.xicluna
Date: Sat Mar 6 15:43:34 2010
New Revision: 78727
Log:
Fix TypeError on usage() when using regrtest switches which are not compatible.
Modified:
python/branches/py3k/Lib/test/regrtest.py
Modified: python/branches/py3k/Lib/test/regrtest.py
==============================================================================
--- python/branches/py3k/Lib/test/regrtest.py (original)
+++ python/branches/py3k/Lib/test/regrtest.py Sat Mar 6 15:43:34 2010
@@ -162,6 +162,7 @@
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 @@
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")
More information about the Python-checkins
mailing list