mirror of https://github.com/python/cpython
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. ........
This commit is contained in:
parent
47befa5f83
commit
78e6957cdf
|
@ -534,6 +534,8 @@ _CookiePattern = re.compile(
|
||||||
r"(?P<val>" # Start of group 'val'
|
r"(?P<val>" # Start of group 'val'
|
||||||
r'"(?:[^\\"]|\\.)*"' # Any doublequoted string
|
r'"(?:[^\\"]|\\.)*"' # Any doublequoted string
|
||||||
r"|" # or
|
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
|
""+ _LegalCharsPatt +"*" # Any word or empty string
|
||||||
r")" # End of group 'val'
|
r")" # End of group 'val'
|
||||||
r"\s*;?" # Probably ending in a semi-colon
|
r"\s*;?" # Probably ending in a semi-colon
|
||||||
|
|
|
@ -178,6 +178,9 @@ def samestat(s1, s2):
|
||||||
|
|
||||||
def ismount(path):
|
def ismount(path):
|
||||||
"""Test whether a path is a mount point"""
|
"""Test whether a path is a mount point"""
|
||||||
|
if islink(path):
|
||||||
|
# A symlink can never be a mount point
|
||||||
|
return False
|
||||||
try:
|
try:
|
||||||
s1 = os.lstat(path)
|
s1 = os.lstat(path)
|
||||||
s2 = os.lstat(join(path, '..'))
|
s2 = os.lstat(join(path, '..'))
|
||||||
|
|
|
@ -62,6 +62,16 @@ class CookieTests(unittest.TestCase):
|
||||||
</script>
|
</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):
|
def test_quoted_meta(self):
|
||||||
# Try cookie with quoted meta-data
|
# Try cookie with quoted meta-data
|
||||||
C = Cookie.SimpleCookie()
|
C = Cookie.SimpleCookie()
|
||||||
|
|
|
@ -9,7 +9,7 @@ the Python Cookbook, published by O'Reilly.
|
||||||
Library usage: see the Timer class.
|
Library usage: see the Timer class.
|
||||||
|
|
||||||
Command line usage:
|
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:
|
Options:
|
||||||
-n/--number N: how many times to execute 'statement' (default: see below)
|
-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)
|
-c/--clock: use time.clock() (default on Windows)
|
||||||
-v/--verbose: print raw timing results; repeat for more digits precision
|
-v/--verbose: print raw timing results; repeat for more digits precision
|
||||||
-h/--help: print this usage message and exit
|
-h/--help: print this usage message and exit
|
||||||
|
--: separate options from statement, use when statement starts with -
|
||||||
statement: statement to be timed (default 'pass')
|
statement: statement to be timed (default 'pass')
|
||||||
|
|
||||||
A multi-line statement may be given by specifying each line as a
|
A multi-line statement may be given by specifying each line as a
|
||||||
|
|
15
Lib/trace.py
15
Lib/trace.py
|
@ -195,11 +195,13 @@ def fullmodname(path):
|
||||||
base = path[len(longest) + 1:]
|
base = path[len(longest) + 1:]
|
||||||
else:
|
else:
|
||||||
base = path
|
base = path
|
||||||
|
# the drive letter is never part of the module name
|
||||||
|
drive, base = os.path.splitdrive(base)
|
||||||
base = base.replace(os.sep, ".")
|
base = base.replace(os.sep, ".")
|
||||||
if os.altsep:
|
if os.altsep:
|
||||||
base = base.replace(os.altsep, ".")
|
base = base.replace(os.altsep, ".")
|
||||||
filename, ext = os.path.splitext(base)
|
filename, ext = os.path.splitext(base)
|
||||||
return filename
|
return filename.lstrip(".")
|
||||||
|
|
||||||
class CoverageResults:
|
class CoverageResults:
|
||||||
def __init__(self, counts=None, calledfuncs=None, infile=None,
|
def __init__(self, counts=None, calledfuncs=None, infile=None,
|
||||||
|
@ -798,7 +800,16 @@ def main(argv=None):
|
||||||
ignoredirs=ignore_dirs, infile=counts_file,
|
ignoredirs=ignore_dirs, infile=counts_file,
|
||||||
outfile=counts_file, timing=timing)
|
outfile=counts_file, timing=timing)
|
||||||
try:
|
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:
|
except IOError, err:
|
||||||
_err_exit("Cannot run file %r because: %s" % (sys.argv[0], err))
|
_err_exit("Cannot run file %r because: %s" % (sys.argv[0], err))
|
||||||
except SystemExit:
|
except SystemExit:
|
||||||
|
|
|
@ -27,6 +27,13 @@ Library
|
||||||
- Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when
|
- Issue #9448: Fix a leak of OS resources (mutexes or semaphores) when
|
||||||
re-initializing a buffered IO object by calling its ``__init__`` method.
|
re-initializing a buffered IO object by calling its ``__init__`` method.
|
||||||
|
|
||||||
|
- 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 #8471: In doctest, properly reset the output stream to an empty
|
- Issue #8471: In doctest, properly reset the output stream to an empty
|
||||||
string when Unicode was previously output.
|
string when Unicode was previously output.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue