summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2009-11-15 00:35:37 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2009-11-15 00:35:37 (GMT)
commit9f9b46cec5a1272b7b12291a514ac7914bd171a3 (patch)
tree8ea419a2599a2974c7c3557b43856125be4e50bc
parent0ee1467704e0c6012df3b4da6dfceeaf61bc701d (diff)
downloadcpython-9f9b46cec5a1272b7b12291a514ac7914bd171a3.zip
cpython-9f9b46cec5a1272b7b12291a514ac7914bd171a3.tar.gz
cpython-9f9b46cec5a1272b7b12291a514ac7914bd171a3.tar.bz2
Merged revisions 76279 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76279 | r.david.murray | 2009-11-14 19:23:21 -0500 (Sat, 14 Nov 2009) | 10 lines Merged revisions 76276 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76276 | r.david.murray | 2009-11-14 19:04:32 -0500 (Sat, 14 Nov 2009) | 3 lines Issue 7324: add a sanity check to regrtest argument parsing to catch the case of an option with no handler. ........ ................
-rwxr-xr-xLib/test/regrtest.py4
-rw-r--r--Misc/NEWS3
2 files changed, 7 insertions, 0 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 0ee8bcc..c2677d2 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -330,6 +330,10 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False,
for m in [msvcrt.CRT_WARN, msvcrt.CRT_ERROR, msvcrt.CRT_ASSERT]:
msvcrt.CrtSetReportMode(m, msvcrt.CRTDBG_MODE_FILE)
msvcrt.CrtSetReportFile(m, msvcrt.CRTDBG_FILE_STDERR)
+ else:
+ print(("No handler for option {}. Please report this as a bug "
+ "at http://bugs.python.org.").format(o), file=sys.stderr)
+ sys.exit(1)
if generate and verbose:
usage("-g and -v don't go together!")
if single and fromfile:
diff --git a/Misc/NEWS b/Misc/NEWS
index 8a7b78d..53945e9 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -149,6 +149,9 @@ Extension Modules
Tests
-----
+- Issue #7324: add a sanity check to regrtest argument parsing to
+ catch the case of an option with no handler.
+
- Issue #6551: test_zipimport could import and then destroy some modules of
the encodings package, which would make other tests fail further down
the road because the internally cached encoders and decoders would point