Merged revisions 83385-83389,83391 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r83385 | georg.brandl | 2010-08-01 08:42:45 +0200 (So, 01 Aug 2010) | 1 line
#8773: mailbox.py does not need to be executable.
........
r83386 | georg.brandl | 2010-08-01 08:44:46 +0200 (So, 01 Aug 2010) | 1 line
#8768: name test method properly so that it gets executed.
........
r83387 | georg.brandl | 2010-08-01 08:53:28 +0200 (So, 01 Aug 2010) | 1 line
#8735: better explain semantics of *values* argument for parse().
........
r83388 | georg.brandl | 2010-08-01 09:48:43 +0200 (So, 01 Aug 2010) | 1 line
#7395: fix traceback in do_add() when no stats are loaded. Apply same fix for do_sort() and do_reverse().
........
r83389 | georg.brandl | 2010-08-01 09:57:47 +0200 (So, 01 Aug 2010) | 1 line
Small improvements to pstats browser: do not crash on reading invalid file, and actually do a reload when executing "read" as intended.
........
r83391 | georg.brandl | 2010-08-01 10:10:08 +0200 (So, 01 Aug 2010) | 1 line
Add another news entry.
........
diff --git a/Lib/pstats.py b/Lib/pstats.py
index 3e6e994..a61e93d 100644
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -596,7 +596,10 @@
print(" that match it are printed.", file=self.stream)
def do_add(self, line):
- self.stats.add(line)
+ if self.stats:
+ self.stats.add(line)
+ else:
+ print("No statistics object is loaded.", file=self.stream)
return 0
def help_add(self):
print("Add profile info from given file to current statistics object.", file=self.stream)
@@ -631,22 +634,33 @@
except IOError as err:
print(err.args[1], file=self.stream)
return
+ except Exception as err:
+ print(err.__class__.__name__ + ':', err, file=self.stream)
+ return
self.prompt = line + "% "
elif len(self.prompt) > 2:
- line = self.prompt[-2:]
+ line = self.prompt[:-2]
+ self.do_read(line)
else:
print("No statistics object is current -- cannot reload.", file=self.stream)
return 0
def help_read(self):
print("Read in profile data from a specified file.", file=self.stream)
+ print("Without argument, reload the current file.", file=self.stream)
def do_reverse(self, line):
- self.stats.reverse_order()
+ if self.stats:
+ self.stats.reverse_order()
+ else:
+ print("No statistics object is loaded.", file=self.stream)
return 0
def help_reverse(self):
print("Reverse the sort order of the profiling report.", file=self.stream)
def do_sort(self, line):
+ if not self.stats:
+ print("No statistics object is loaded.", file=self.stream)
+ return
abbrevs = self.stats.get_sort_arg_defs()
if line and not filter(lambda x,a=abbrevs: x not in a,line.split()):
self.stats.sort_stats(*line.split())
@@ -668,11 +682,16 @@
self.generic_help()
def do_strip(self, line):
- self.stats.strip_dirs()
- return 0
+ if self.stats:
+ self.stats.strip_dirs()
+ else:
+ print("No statistics object is loaded.", file=self.stream)
def help_strip(self):
print("Strip leading path information from filenames in the report.", file=self.stream)
+ def help_help(self):
+ print("Show help for a given command.", file=self.stream)
+
def postcmd(self, stop, line):
if stop:
return stop