From d9ede202ea728176db3b6be23c677c090ab36e6f Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sun, 1 Aug 2010 22:13:33 +0000 Subject: 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. ........ ................ --- Doc/library/optparse.rst | 5 +++-- Lib/Cookie.py | 2 ++ Lib/mailbox.py | 0 Lib/posixpath.py | 3 +++ Lib/pstats.py | 29 ++++++++++++++++++++++++----- Lib/test/test_cookie.py | 10 ++++++++++ Lib/test/test_set.py | 2 +- Lib/timeit.py | 3 ++- Lib/trace.py | 15 +++++++++++++-- Misc/NEWS | 9 +++++++++ 10 files changed, 67 insertions(+), 11 deletions(-) mode change 100755 => 100644 Lib/mailbox.py diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst index 24c84b1..c543bd9 100644 --- a/Doc/library/optparse.rst +++ b/Doc/library/optparse.rst @@ -1233,8 +1233,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/Cookie.py b/Lib/Cookie.py index 99a94da..600d212 100644 --- a/Lib/Cookie.py +++ b/Lib/Cookie.py @@ -534,6 +534,8 @@ _CookiePattern = re.compile( r"(?P" # 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 diff --git a/Lib/mailbox.py b/Lib/mailbox.py old mode 100755 new mode 100644 diff --git a/Lib/posixpath.py b/Lib/posixpath.py index 44519d4..6e2ee175 100644 --- a/Lib/posixpath.py +++ b/Lib/posixpath.py @@ -178,6 +178,9 @@ def samestat(s1, s2): 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, '..')) 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 @@ if __name__ == '__main__': 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 @@ if __name__ == '__main__': 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 @@ 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 >> 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 diff --git a/Lib/test/test_cookie.py b/Lib/test/test_cookie.py index e7c0cf1..474b856 100644 --- a/Lib/test/test_cookie.py +++ b/Lib/test/test_cookie.py @@ -66,6 +66,16 @@ class CookieTests(unittest.TestCase): """) + # 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() diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index d53b916..c2e2ad1 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -751,7 +751,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/Lib/timeit.py b/Lib/timeit.py index 9054243..09f37c4 100644 --- a/Lib/timeit.py +++ b/Lib/timeit.py @@ -9,7 +9,7 @@ the Python Cookbook, published by O'Reilly. 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 @@ Options: -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 diff --git a/Lib/trace.py b/Lib/trace.py index 6d5aef0..3611f88 100644 --- a/Lib/trace.py +++ b/Lib/trace.py @@ -195,11 +195,13 @@ def fullmodname(path): 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 @@ def main(argv=None): 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: diff --git a/Misc/NEWS b/Misc/NEWS index 9440045..e4a73c9 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -89,6 +89,15 @@ 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. + +- 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. -- cgit v0.12