summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Corchero <mariocj89@gmail.com>2018-01-28 04:58:47 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2018-01-28 04:58:47 (GMT)
commitfcf8b4c1022bc2d2f84dcef5d72eabf40a25ea19 (patch)
tree23047a8d12b7b1d007f3c6a5b60c05fd52b1e790
parentdd0e087edc8f1e4d2c0913236b1a62a77d9db6d8 (diff)
downloadcpython-fcf8b4c1022bc2d2f84dcef5d72eabf40a25ea19.zip
cpython-fcf8b4c1022bc2d2f84dcef5d72eabf40a25ea19.tar.gz
cpython-fcf8b4c1022bc2d2f84dcef5d72eabf40a25ea19.tar.bz2
bpo-32206: Update pdb usage to include new module option (GH-5111)
-rwxr-xr-xLib/pdb.py6
-rw-r--r--Lib/test/test_pdb.py5
2 files changed, 8 insertions, 3 deletions
diff --git a/Lib/pdb.py b/Lib/pdb.py
index d1a74bb..366a85b 100755
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -1638,9 +1638,11 @@ def help():
pydoc.pager(__doc__)
_usage = """\
-usage: pdb.py [-c command] ... pyfile [arg] ...
+usage: pdb.py [-c command] ... [-m module | pyfile] [arg] ...
-Debug the Python program given by pyfile.
+Debug the Python program given by pyfile. Alternatively,
+an executable module or package to debug can be specified using
+the -m switch.
Initial commands are read from .pdbrc files in your home directory
and in the current directory, if they exist. Commands supplied with
diff --git a/Lib/test/test_pdb.py b/Lib/test/test_pdb.py
index 0cd235e..85b47d5 100644
--- a/Lib/test/test_pdb.py
+++ b/Lib/test/test_pdb.py
@@ -1182,7 +1182,10 @@ class PdbTestCase(unittest.TestCase):
quit
"""
stdout, stderr = self._run_pdb(["-m", "pdb"], commands)
- self.assertIn("Debug the Python program given by pyfile.", stdout.splitlines())
+ self.assertIn(
+ pdb._usage,
+ stdout.replace('\r', '') # remove \r for windows
+ )
def test_module_without_a_main(self):
module_name = 't_main'