closes bpo-37803: pdb: fix handling of options (--help / --version) (GH-15193)

The "--" should not be included with long options passed to
getopt.getopt.

Fixes https://bugs.python.org/issue37803
(cherry picked from commit 855df7f273c3988c72f01e51ba57091887ec38b2)

Co-authored-by: Daniel Hahler <github@thequod.de>

diff --git a/Lib/pdb.py b/Lib/pdb.py
index 8c1c96163ed913c538e6b7a4064ddfb6fd59a06a..8639204891cb01e11134bc7f9171ab079b3f6e0d 100755 (executable)
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -1660,7 +1660,7 @@ To let the script run up to a given line X in the debugged file, use
 def main():
     import getopt
 
-    opts, args = getopt.getopt(sys.argv[1:], 'mhc:', ['--help', '--command='])
+    opts, args = getopt.getopt(sys.argv[1:], 'mhc:', ['help', 'command='])
 
     if not args:
         print(_usage)

diff --git a/Misc/NEWS.d/next/Tools-Demos/2019-09-12-16-15-55.bpo-37803.chEizy.rst b/Misc/NEWS.d/next/Tools-Demos/2019-09-12-16-15-55.bpo-37803.chEizy.rst
new file mode 100644 (file)
index 0000000..5c0eedb
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2019-09-12-16-15-55.bpo-37803.chEizy.rst
@@ -0,0 +1 @@
+pdb's ``--help`` and ``--version`` long options now work.