[Python-checkins] [2.7] bpo-23420: Verify the value of '-s' when execute the CLI of cProfile (GH-9925) (GH-9928)

Wed Oct 17 07:51:31 EDT 2018

https://github.com/python/cpython/commit/6e57382464101d2669a425622e19fff57586b2ff
commit: 6e57382464101d2669a425622e19fff57586b2ff
branch: 2.7
author: Stéphane Wirtel <stephane at wirtel.be>
committer: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
date: 2018年10月17日T04:51:28-07:00
summary:
[2.7] bpo-23420: Verify the value of '-s' when execute the CLI of cProfile (GH-9925) (GH-9928)
Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert
Kuska.
Co-authored-by: Robert Kuska <rkuska at gmail.com>
(cherry picked from commit fcd5e84a515e19409840c570730f0728e9fcfc83)
https://bugs.python.org/issue23420
files:
A Misc/NEWS.d/next/Library/2018-10-17-11-00-00.bpo-23420.Lq74Uu.rst
M Lib/cProfile.py
M Lib/test/test_cprofile.py

diff --git a/Lib/cProfile.py b/Lib/cProfile.py
index d3770946db11..cd53cc0abd53 100755
--- a/Lib/cProfile.py
+++ b/Lib/cProfile.py
@@ -161,7 +161,7 @@ def label(code):
 # ____________________________________________________________
 
 def main():
- import os, sys
+ import os, sys, pstats
 from optparse import OptionParser
 usage = "cProfile.py [-o output_file_path] [-s sort] scriptfile [arg] ..."
 parser = OptionParser(usage=usage)
@@ -170,7 +170,8 @@ def main():
 help="Save stats to <outfile>", default=None)
 parser.add_option('-s', '--sort', dest="sort",
 help="Sort order when printing to stdout, based on pstats.Stats class",
- default=-1)
+ default=-1,
+ choices=sorted(pstats.Stats.sort_arg_dict_default))
 
 if not sys.argv[1:]:
 parser.print_usage()
diff --git a/Lib/test/test_cprofile.py b/Lib/test/test_cprofile.py
index af3fe62a9a6b..83d52296e218 100644
--- a/Lib/test/test_cprofile.py
+++ b/Lib/test/test_cprofile.py
@@ -1,7 +1,9 @@
 """Test suite for the cProfile module."""
 
 import sys
+import unittest
 from test.test_support import run_unittest, TESTFN, unlink
+from test.support.script_helper import assert_python_failure
 
 # rip off all interesting stuff from test_profile
 import cProfile
@@ -26,8 +28,14 @@ def test_bad_counter_during_dealloc(self):
 unlink(TESTFN)
 
 
+class TestCommandLine(unittest.TestCase):
+ def test_sort(self):
+ rc, out, err = assert_python_failure('-m', 'cProfile', '-s', 'demo')
+ self.assertGreater(rc, 0)
+ self.assertIn(b"option -s: invalid choice: 'demo'", err)
+
 def test_main():
- run_unittest(CProfileTest)
+ run_unittest(CProfileTest, TestCommandLine)
 
 def main():
 if '-r' not in sys.argv:
diff --git a/Misc/NEWS.d/next/Library/2018-10-17-11-00-00.bpo-23420.Lq74Uu.rst b/Misc/NEWS.d/next/Library/2018-10-17-11-00-00.bpo-23420.Lq74Uu.rst
new file mode 100644
index 000000000000..034e7e53970a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-10-17-11-00-00.bpo-23420.Lq74Uu.rst
@@ -0,0 +1,2 @@
+Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert
+Kuska
