Merged revisions 83421,83424 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
................
r83421 | georg.brandl | 2010-08-01 20:52:52 +0200 (So, 01 Aug 2010) | 25 lines
Merged revisions 83393,83396,83398,83405,83408 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83393 | georg.brandl | 2010-08-01 10:35:29 +0200 (So, 01 Aug 2010) | 1 line
#1690103: fix initial namespace for code run with trace.main().
........
r83396 | georg.brandl | 2010-08-01 10:52:32 +0200 (So, 01 Aug 2010) | 1 line
#4810: document "--" option separator in timeit help.
........
r83398 | georg.brandl | 2010-08-01 11:06:34 +0200 (So, 01 Aug 2010) | 1 line
#8826: the "expires" attribute value is a date string with spaces, but apparently not all user-agents put it in quotes. Handle that as a special case.
........
r83405 | georg.brandl | 2010-08-01 16:38:17 +0200 (So, 01 Aug 2010) | 1 line
#4943: do not try to include drive letters (and colons) when looking for a probably module name.
........
r83408 | georg.brandl | 2010-08-01 17:30:56 +0200 (So, 01 Aug 2010) | 1 line
#5551: symbolic links never can be mount points. Fixes the fix for #1713.
........
................
r83424 | georg.brandl | 2010-08-01 21:02:09 +0200 (So, 01 Aug 2010) | 29 lines
Merged revisions 83385-83389,83391 via svnmerge from
svn+ssh://pythondev@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 a6844fb..08f2318 100644
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -597,7 +597,10 @@
print >> self.stream, " that match it are printed."
def do_add(self, line):
- self.stats.add(line)
+ if self.stats:
+ self.stats.add(line)
+ else:
+ print >> self.stream, "No statistics object is loaded."
return 0
def help_add(self):
print >> self.stream, "Add profile info from given file to current statistics object."
@@ -632,22 +635,33 @@
except IOError, args:
print >> self.stream, args[1]
return
+ except Exception as err:
+ print >> self.stream, err.__class__.__name__ + ':', err
+ return
self.prompt = line + "% "
elif len(self.prompt) > 2:
- line = self.prompt[-2:]
+ line = self.prompt[:-2]
+ self.do_read(line)
else:
print >> self.stream, "No statistics object is current -- cannot reload."
return 0
def help_read(self):
print >> self.stream, "Read in profile data from a specified file."
+ print >> self.stream, "Without argument, reload the current file."
def do_reverse(self, line):
- self.stats.reverse_order()
+ if self.stats:
+ self.stats.reverse_order()
+ else:
+ print >> self.stream, "No statistics object is loaded."
return 0
def help_reverse(self):
print >> self.stream, "Reverse the sort order of the profiling report."
def do_sort(self, line):
+ if not self.stats:
+ print >> self.stream, "No statistics object is loaded."
+ 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())
@@ -669,11 +683,16 @@
self.generic_help()
def do_strip(self, line):
- self.stats.strip_dirs()
- return 0
+ if self.stats:
+ self.stats.strip_dirs()
+ else:
+ print >> self.stream, "No statistics object is loaded."
def help_strip(self):
print >> self.stream, "Strip leading path information from filenames in the report."
+ def help_help(self):
+ print >> self.stream, "Show help for a given command."
+
def postcmd(self, stop, line):
if stop:
return stop