From 9d8c18665004755d87ba891a822265199a160609 Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Wed, 14 Mar 2012 17:47:11 +0100 Subject: Issue #13839: When invoked on the command-line, the pstats module now accepts several filenames of profile stat files and merges them all. Patch by Matt Joiner. --- Lib/pstats.py | 2 ++ Misc/NEWS | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Lib/pstats.py b/Lib/pstats.py index 334d717..13d944c 100644 --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -680,6 +680,8 @@ if __name__ == '__main__': initprofile = None try: browser = ProfileBrowser(initprofile) + for profile in sys.argv[2:]: + browser.do_add(profile) print("Welcome to the profile statistics browser.", file=browser.stream) browser.cmdloop() print("Goodbye.", file=browser.stream) diff --git a/Misc/NEWS b/Misc/NEWS index 0d6cdbb..3652d61 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -24,6 +24,10 @@ Core and Builtins Library ------- +- Issue #13839: When invoked on the command-line, the pstats module now + accepts several filenames of profile stat files and merges them all. + Patch by Matt Joiner. + - Issue #14291: Email now defaults to utf-8 for non-ASCII unicode headers instead of raising an error. This fixes a regression relative to 2.7. -- cgit v0.12