From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Thu, 12 Sep 2019 16:05:52 +0000 (-0700)
Subject: closes bpo-37803: pdb: fix handling of options (--help / --version) (GH-15193)
X-Git-Tag: v3.8.0rc1~127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21bfff9a5a766acfbdd899687850f563893a0f9e;p=python

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 8c1c96163e..8639204891 100755
--- 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
index 0000000000..5c0eedb937
--- /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.