Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2018
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Lib/cProfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
Expand Down
10 changes: 9 additions & 1 deletion Lib/test/test_cprofile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Library/2018-10-17-11-00-00.bpo-23420.Lq74Uu.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert
Kuska