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.
This commit is contained in:
Antoine Pitrou 2012-03-14 17:47:11 +01:00
parent c5ceb0aaaf
commit 9d8c186650
2 changed files with 6 additions and 0 deletions

View File

@ -680,6 +680,8 @@ if __name__ == '__main__':
initprofile = None initprofile = None
try: try:
browser = ProfileBrowser(initprofile) browser = ProfileBrowser(initprofile)
for profile in sys.argv[2:]:
browser.do_add(profile)
print("Welcome to the profile statistics browser.", file=browser.stream) print("Welcome to the profile statistics browser.", file=browser.stream)
browser.cmdloop() browser.cmdloop()
print("Goodbye.", file=browser.stream) print("Goodbye.", file=browser.stream)

View File

@ -24,6 +24,10 @@ Core and Builtins
Library 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 - 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. instead of raising an error. This fixes a regression relative to 2.7.