[Python-checkins] r83495 - in python/branches/release26-maint: Doc/library/optparse.rst Lib/Cookie.py Lib/mailbox.py Lib/posixpath.py Lib/pstats.py Lib/test/test_cookie.py Lib/test/test_set.py Lib/timeit.py Lib/trace.py Misc/NEWS
georg.brandl
python-checkins at python.org
Mon Aug 2 00:13:33 CEST 2010
Author: georg.brandl
Date: Mon Aug 2 00:13:33 2010
New Revision: 83495
Log:
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.
........
................
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Doc/library/optparse.rst
python/branches/release26-maint/Lib/Cookie.py
python/branches/release26-maint/Lib/mailbox.py (props changed)
python/branches/release26-maint/Lib/posixpath.py
python/branches/release26-maint/Lib/pstats.py
python/branches/release26-maint/Lib/test/test_cookie.py
python/branches/release26-maint/Lib/test/test_set.py
python/branches/release26-maint/Lib/timeit.py
python/branches/release26-maint/Lib/trace.py
python/branches/release26-maint/Misc/NEWS
Modified: python/branches/release26-maint/Doc/library/optparse.rst
==============================================================================
--- python/branches/release26-maint/Doc/library/optparse.rst (original)
+++ python/branches/release26-maint/Doc/library/optparse.rst Mon Aug 2 00:13:33 2010
@@ -1233,8 +1233,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/release26-maint/Lib/Cookie.py
==============================================================================
--- python/branches/release26-maint/Lib/Cookie.py (original)
+++ python/branches/release26-maint/Lib/Cookie.py Mon Aug 2 00:13:33 2010
@@ -534,6 +534,8 @@
r"(?P<val>" # Start of group 'val'
r'"(?:[^\\"]|\\.)*"' # Any doublequoted string
r"|" # or
+ r"\w{3},\s[\w\d-]{9,11}\s[\d:]{8}\sGMT" # Special case for "expires" attr
+ r"|" # or
""+ _LegalCharsPatt +"*" # Any word or empty string
r")" # End of group 'val'
r"\s*;?" # Probably ending in a semi-colon
Modified: python/branches/release26-maint/Lib/posixpath.py
==============================================================================
--- python/branches/release26-maint/Lib/posixpath.py (original)
+++ python/branches/release26-maint/Lib/posixpath.py Mon Aug 2 00:13:33 2010
@@ -178,6 +178,9 @@
def ismount(path):
"""Test whether a path is a mount point"""
+ if islink(path):
+ # A symlink can never be a mount point
+ return False
try:
s1 = os.lstat(path)
s2 = os.lstat(join(path, '..'))
Modified: python/branches/release26-maint/Lib/pstats.py
==============================================================================
--- python/branches/release26-maint/Lib/pstats.py (original)
+++ python/branches/release26-maint/Lib/pstats.py Mon Aug 2 00:13:33 2010
@@ -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
Modified: python/branches/release26-maint/Lib/test/test_cookie.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_cookie.py (original)
+++ python/branches/release26-maint/Lib/test/test_cookie.py Mon Aug 2 00:13:33 2010
@@ -66,6 +66,16 @@
</script>
""")
+ # loading 'expires'
+ C = Cookie.SimpleCookie()
+ C.load('Customer="W"; expires=Wed, 01-Jan-2010 00:00:00 GMT')
+ self.assertEqual(C['Customer']['expires'],
+ 'Wed, 01-Jan-2010 00:00:00 GMT')
+ C = Cookie.SimpleCookie()
+ C.load('Customer="W"; expires=Wed, 01-Jan-98 00:00:00 GMT')
+ self.assertEqual(C['Customer']['expires'],
+ 'Wed, 01-Jan-98 00:00:00 GMT')
+
def test_quoted_meta(self):
# Try cookie with quoted meta-data
C = Cookie.SimpleCookie()
Modified: python/branches/release26-maint/Lib/test/test_set.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_set.py (original)
+++ python/branches/release26-maint/Lib/test/test_set.py Mon Aug 2 00:13:33 2010
@@ -751,7 +751,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/release26-maint/Lib/timeit.py
==============================================================================
--- python/branches/release26-maint/Lib/timeit.py (original)
+++ python/branches/release26-maint/Lib/timeit.py Mon Aug 2 00:13:33 2010
@@ -9,7 +9,7 @@
Library usage: see the Timer class.
Command line usage:
- python timeit.py [-n N] [-r N] [-s S] [-t] [-c] [-h] [statement]
+ python timeit.py [-n N] [-r N] [-s S] [-t] [-c] [-h] [--] [statement]
Options:
-n/--number N: how many times to execute 'statement' (default: see below)
@@ -19,6 +19,7 @@
-c/--clock: use time.clock() (default on Windows)
-v/--verbose: print raw timing results; repeat for more digits precision
-h/--help: print this usage message and exit
+ --: separate options from statement, use when statement starts with -
statement: statement to be timed (default 'pass')
A multi-line statement may be given by specifying each line as a
Modified: python/branches/release26-maint/Lib/trace.py
==============================================================================
--- python/branches/release26-maint/Lib/trace.py (original)
+++ python/branches/release26-maint/Lib/trace.py Mon Aug 2 00:13:33 2010
@@ -195,11 +195,13 @@
base = path[len(longest) + 1:]
else:
base = path
+ # the drive letter is never part of the module name
+ drive, base = os.path.splitdrive(base)
base = base.replace(os.sep, ".")
if os.altsep:
base = base.replace(os.altsep, ".")
filename, ext = os.path.splitext(base)
- return filename
+ return filename.lstrip(".")
class CoverageResults:
def __init__(self, counts=None, calledfuncs=None, infile=None,
@@ -798,7 +800,16 @@
ignoredirs=ignore_dirs, infile=counts_file,
outfile=counts_file, timing=timing)
try:
- t.run('execfile(%r)' % (progname,))
+ with open(progname) as fp:
+ code = compile(fp.read(), progname, 'exec')
+ # try to emulate __main__ namespace as much as possible
+ globs = {
+ '__file__': progname,
+ '__name__': '__main__',
+ '__package__': None,
+ '__cached__': None,
+ }
+ t.runctx(code, globs, globs)
except IOError, err:
_err_exit("Cannot run file %r because: %s" % (sys.argv[0], err))
except SystemExit:
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Mon Aug 2 00:13:33 2010
@@ -89,6 +89,15 @@
Library
-------
+- Issue #7395: Fix tracebacks in pstats interactive browser.
+
+- Issue #1713: Fix os.path.ismount(), which returned true for symbolic links
+ across devices.
+
+- Issue #8826: Properly load old-style "expires" attribute in http.cookies.
+
+- Issue #1690103: Fix initial namespace for code run with trace.main().
+
- Issue #5294: Fix the behavior of pdb's "continue" command when called
in the top-level debugged frame.
More information about the Python-checkins
mailing list