[Python-checkins] r83424 - in python/branches/release27-maint: Doc/library/optparse.rst Lib/mailbox.py Lib/pstats.py Lib/test/test_set.py Misc/NEWS
georg.brandl
python-checkins at python.org
Sun Aug 1 21:02:09 CEST 2010
Author: georg.brandl
Date: Sun Aug 1 21:02:09 2010
New Revision: 83424
Log:
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.
........
Modified:
python/branches/release27-maint/ (props changed)
python/branches/release27-maint/Doc/library/optparse.rst
python/branches/release27-maint/Lib/mailbox.py (props changed)
python/branches/release27-maint/Lib/pstats.py
python/branches/release27-maint/Lib/test/test_set.py
python/branches/release27-maint/Misc/NEWS
Modified: python/branches/release27-maint/Doc/library/optparse.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/optparse.rst (original)
+++ python/branches/release27-maint/Doc/library/optparse.rst Sun Aug 1 21:02:09 2010
@@ -1238,8 +1238,9 @@
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
Modified: python/branches/release27-maint/Lib/pstats.py
==============================================================================
--- python/branches/release27-maint/Lib/pstats.py (original)
+++ python/branches/release27-maint/Lib/pstats.py Sun Aug 1 21:02:09 2010
@@ -588,7 +588,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."
@@ -623,22 +626,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 all((x in abbrevs) for x in line.split()):
self.stats.sort_stats(*line.split())
@@ -660,11 +674,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
Modified: python/branches/release27-maint/Lib/test/test_set.py
==============================================================================
--- python/branches/release27-maint/Lib/test/test_set.py (original)
+++ python/branches/release27-maint/Lib/test/test_set.py Sun Aug 1 21:02:09 2010
@@ -750,7 +750,7 @@
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)
Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS (original)
+++ python/branches/release27-maint/Misc/NEWS Sun Aug 1 21:02:09 2010
@@ -27,6 +27,10 @@
- Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when
re-initializing a buffered IO object by calling its ``__init__`` method.
+- Issue #7395: Fix tracebacks in pstats interactive browser.
+
+- Issue #8230: Fix Lib/test/sortperf.py.
+
- Issue #1713: Fix os.path.ismount(), which returned true for symbolic links
across devices.
More information about the Python-checkins
mailing list