bpo-23420: Verify the value of '-s' when execute the CLI of cProfile #9925

matrixise · 2018-10-17T09:03:06Z

https://bugs.python.org/issue23420

Co-authored-by: Robert Kuska <rkuska@gmail.com>

vstinner · 2018-10-17T09:31:11Z

Lib/cProfile.py

@@ -139,7 +140,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=list(pstats.Stats.sort_arg_dict_default.keys()))


.keys() is not needed.

By the way, maybe we should sort choices? Like sorted(...)?

Suggested change

choices=list(pstats.Stats.sort_arg_dict_default.keys()))

choices=sorted(pstats.Stats.sort_arg_dict_default)

bedevere-bot · 2018-10-17T09:31:14Z

A Python core developer has requested some changes be made to your pull request before we can consider merging it. If you could please address their requests along with any other requests in other reviews from core developers that would be appreciated.

Once you have made the requested changes, please leave a comment on this pull request containing the phrase I have made the requested changes; please review again. I will then notify any core developers who have left a review that you're ready for them to take another look at this pull request.

miss-islington · 2018-10-17T10:03:43Z

Thanks @matrixise for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.6, 3.7.
🐍🍒⛏🤖

miss-islington · 2018-10-17T10:03:48Z

Sorry, @matrixise and @vstinner, I could not cleanly backport this to 3.7 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker fcd5e84a515e19409840c570730f0728e9fcfc83 3.7

miss-islington · 2018-10-17T10:03:52Z

Sorry, @matrixise and @vstinner, I could not cleanly backport this to 3.6 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker fcd5e84a515e19409840c570730f0728e9fcfc83 3.6

…ofile (pythonGH-9925) Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert Kuska. Co-authored-by: Robert Kuska <rkuska@gmail.com> (cherry picked from commit fcd5e84)

bedevere-bot · 2018-10-17T10:33:48Z

GH-9926 is a backport of this pull request to the 3.7 branch.

…ofile (pythonGH-9925) Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert Kuska. Co-authored-by: Robert Kuska <rkuska@gmail.com> (cherry picked from commit fcd5e84)

bedevere-bot · 2018-10-17T11:18:56Z

GH-9927 is a backport of this pull request to the 3.6 branch.

…ofile (pythonGH-9925) Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert Kuska. Co-authored-by: Robert Kuska <rkuska@gmail.com> (cherry picked from commit fcd5e84)

…ofile (GH-9925) (GH-9926) [3.7] [bpo-23420](https://bugs.python.org/issue23420): Verify the value of '-s' when execute the CLI of cProfile (GH-9925) Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert Kuska. Co-authored-by: Robert Kuska <rkuska@gmail.com> (cherry picked from commit fcd5e84) https://bugs.python.org/issue23420

…ofile (GH-9925) (GH-9927) Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert Kuska. Co-authored-by: Robert Kuska <rkuska@gmail.com> (cherry picked from commit fcd5e84)

…ofile (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@gmail.com> (cherry picked from commit fcd5e84) https://bugs.python.org/issue23420

* master: (621 commits) Update opcode.h header comment to mention the source data file (pythonGH-9935) bpo-34936: Fix TclError in tkinter.Spinbox.selection_element(). (pythonGH-9760) Updated documentation on logging.debug(). (pythonGH-9946) bpo-34765: Update the install-sh file (pythonGH-9592) bpo-35008: Fix possible leaks in Element.__setstate__(). (pythonGH-9924) bpo-35011: Restore use of pyexpatns.h in libexpat (pythonGH-9939) bpo-24658: Fix read/write greater than 2 GiB on macOS (pythonGH-1705) Add missing comma to wsgiref doc (pythonGH-9932) bpo-23420: Verify the value of '-s' when execute the CLI of cProfile (pythonGH-9925) Doc: Fix is_prime (pythonGH-9909) In email docs, correct spelling of foregoing (python#9856) In email.parser in message_from_bytes, update `strict` to `policy` (python#9854) bpo-34997: Fix test_logging.ConfigDictTest.test_out_of_order (pythonGH-9913) Added CLI starter example to logging cookbook. (pythonGH-9910) bpo-34783: Fix test_nonexisting_script() (pythonGH-9896) bpo-23554: Change echo server example class name from EchoServerClientProtocol to EchoServerProtocol (pythonGH-9859) bpo-34989: python-gdb.py: fix current_line_num() (pythonGH-9889) Stop using deprecated logging API in Sphinx suspicious checker (pythonGH-9875) fix dangling keyfunc examples in documentation of heapq and sorted (python#1432) bpo-34844: logging.Formatter enhancement - Ensure style and format string matches in logging.Formatter (pythonGH-9703) ...

* master: (1787 commits) Update opcode.h header comment to mention the source data file (pythonGH-9935) bpo-34936: Fix TclError in tkinter.Spinbox.selection_element(). (pythonGH-9760) Updated documentation on logging.debug(). (pythonGH-9946) bpo-34765: Update the install-sh file (pythonGH-9592) bpo-35008: Fix possible leaks in Element.__setstate__(). (pythonGH-9924) bpo-35011: Restore use of pyexpatns.h in libexpat (pythonGH-9939) bpo-24658: Fix read/write greater than 2 GiB on macOS (pythonGH-1705) Add missing comma to wsgiref doc (pythonGH-9932) bpo-23420: Verify the value of '-s' when execute the CLI of cProfile (pythonGH-9925) Doc: Fix is_prime (pythonGH-9909) In email docs, correct spelling of foregoing (python#9856) In email.parser in message_from_bytes, update `strict` to `policy` (python#9854) bpo-34997: Fix test_logging.ConfigDictTest.test_out_of_order (pythonGH-9913) Added CLI starter example to logging cookbook. (pythonGH-9910) bpo-34783: Fix test_nonexisting_script() (pythonGH-9896) bpo-23554: Change echo server example class name from EchoServerClientProtocol to EchoServerProtocol (pythonGH-9859) bpo-34989: python-gdb.py: fix current_line_num() (pythonGH-9889) Stop using deprecated logging API in Sphinx suspicious checker (pythonGH-9875) fix dangling keyfunc examples in documentation of heapq and sorted (python#1432) bpo-34844: logging.Formatter enhancement - Ensure style and format string matches in logging.Formatter (pythonGH-9703) ...

…ofile (pythonGH-9925) (pythonGH-9928) Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert Kuska. Co-authored-by: Robert Kuska <rkuska@gmail.com> (cherry picked from commit fcd5e84) https://bugs.python.org/issue23420

…pythonGH-9925) Verify the value for the parameter '-s' of the cProfile CLI. Patch by Robert Kuska. Co-authored-by: Robert Kuska <rkuska@gmail.com>

matrixise and others added 2 commits Oct 17, 2018

bpo-23420: Verify the value of '-s' when execute the CLI of cProfile.

fc718f8

Co-authored-by: Robert Kuska <rkuska@gmail.com>

Add a test for the parameter '-s' for the CLI of cPython

Loading status checks…

e110b8d

the-knights-who-say-ni added the CLA signed label Oct 17, 2018

bedevere-bot added the awaiting review label Oct 17, 2018

vstinner requested changes Oct 17, 2018

View changes

bedevere-bot removed the awaiting review label Oct 17, 2018

bedevere-bot added the awaiting changes label Oct 17, 2018

matrixise added 2 commits Oct 17, 2018

Remove the usage of .keys()

Loading status checks…

dbe15f9

Use sort for the choices of '-s'

Loading status checks…

fef9db2

vstinner approved these changes Oct 17, 2018

View changes

bedevere-bot added awaiting merge and removed awaiting changes labels Oct 17, 2018

vstinner added needs backport to 3.6 needs backport to 3.7 labels Oct 17, 2018

bedevere-bot removed the awaiting merge label Oct 17, 2018

miss-islington assigned vstinner Oct 17, 2018

matrixise mentioned this pull request Oct 17, 2018

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

Merged

bedevere-bot removed the needs backport to 3.7 label Oct 17, 2018

bedevere-bot removed the needs backport to 3.6 label Oct 17, 2018

python / cpython

bpo-23420: Verify the value of '-s' when execute the CLI of cProfile #9925

bpo-23420: Verify the value of '-s' when execute the CLI of cProfile #9925

matrixise commented Oct 17, 2018 •

edited by bedevere-bot

This comment has been minimized.

This comment has been minimized.

bedevere-bot commented Oct 17, 2018

miss-islington commented Oct 17, 2018

miss-islington commented Oct 17, 2018

miss-islington commented Oct 17, 2018

bedevere-bot commented Oct 17, 2018

bedevere-bot commented Oct 17, 2018

	choices=list(pstats.Stats.sort_arg_dict_default.keys()))
	choices=sorted(pstats.Stats.sort_arg_dict_default)

python / cpython

Sponsor python/cpython

bpo-23420: Verify the value of '-s' when execute the CLI of cProfile #9925

bpo-23420: Verify the value of '-s' when execute the CLI of cProfile #9925

Conversation

matrixise commented Oct 17, 2018 • edited by bedevere-bot

This comment has been minimized.

vstinner Oct 17, 2018 Member

This comment has been minimized.

vstinner Oct 17, 2018 Member

bedevere-bot commented Oct 17, 2018

miss-islington commented Oct 17, 2018

miss-islington commented Oct 17, 2018

miss-islington commented Oct 17, 2018

bedevere-bot commented Oct 17, 2018

bedevere-bot commented Oct 17, 2018

matrixise commented Oct 17, 2018 •

edited by bedevere-bot

vstinner Oct 17, 2018
Member

vstinner Oct 17, 2018
Member