From 44c58236d748b3301b0bc6057f8a93d8eeb2ab3c Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 1 Aug 2010 19:04:55 +0000 Subject: 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. ........ --- Doc/library/optparse.rst | 5 +++-- Lib/mailbox.py | 0 Lib/pstats.py | 29 ++++++++++++++++++++++++----- Lib/test/test_set.py | 2 +- Misc/NEWS | 2 ++ 5 files changed, 30 insertions(+), 8 deletions(-) mode change 100755 => 100644 Lib/mailbox.py diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst index 8a5b9c2..918e3ec 100644 --- a/Doc/library/optparse.rst +++ b/Doc/library/optparse.rst @@ -1228,8 +1228,9 @@ where the input parameters are the list of arguments to process (default: ``sys.argv[1:]``) ``values`` - object to store option arguments in (default: a new instance of - :class:`optparse.Values`) + a :class:`optparse.Values` object to store option arguments in (default: a + new instance of :class:`Values`) -- if you give an existing object, the + option defaults will not be initialized on it and the return values are diff --git a/Lib/mailbox.py b/Lib/mailbox.py old mode 100755 new mode 100644 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 @@ if __name__ == '__main__': 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 @@ if __name__ == '__main__': 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 @@ if __name__ == '__main__': 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 diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index 3dde82f..de0d9a8 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -797,7 +797,7 @@ class TestBasicOps(unittest.TestCase): result = self.set ^ self.set self.assertEqual(result, empty_set) - def checkempty_symmetric_difference(self): + def test_empty_symmetric_difference(self): result = self.set ^ empty_set self.assertEqual(result, self.set) diff --git a/Misc/NEWS b/Misc/NEWS index 3637754..3f186a6 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -84,6 +84,8 @@ C-API Library ------- +- Issue #7395: Fix tracebacks in pstats interactive browser. + - Issue #1713: Fix os.path.ismount(), which returned true for symbolic links across devices. -- cgit v0.12