summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-03-14 16:47:11 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-03-14 16:47:11 (GMT)
commit9d8c18665004755d87ba891a822265199a160609 (patch)
treeee53d752d99420d7fe2b33684a6a25aa1c242e3a /Lib
parentc5ceb0aaafa3064c8f301ebbedf44f421d3f3eba (diff)
downloadcpython-9d8c18665004755d87ba891a822265199a160609.zip
cpython-9d8c18665004755d87ba891a822265199a160609.tar.gz
cpython-9d8c18665004755d87ba891a822265199a160609.tar.bz2
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.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/pstats.py2
1 files changed, 2 insertions, 0 deletions
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)