Mailman 3 July 2010 - Python-checkins

r83376 - python/branches/py3k/PC/VS8.0/pythoncore.vcproj
by raymond.hettinger 31 Jul '10

31 Jul '10

Author: raymond.hettinger Date: Sun Aug 1 01:33:22 2010 New Revision: 83376 Log: Fix build on VS8. Modified: python/branches/py3k/PC/VS8.0/pythoncore.vcproj Modified: python/branches/py3k/PC/VS8.0/pythoncore.vcproj ============================================================================== --- python/branches/py3k/PC/VS8.0/pythoncore.vcproj (original) +++ python/branches/py3k/PC/VS8.0/pythoncore.vcproj Sun Aug 1 01:33:22 2010 @@ -1091,7 +1091,7 @@ > </File> <File - RelativePath="..\..\Modules\datetimemodule.c" + RelativePath="..\..\Modules\_datetimemodule.c" > </File> <File

1 0

r83375 - python/branches/py3k/Doc/whatsnew/3.2.rst
by antoine.pitrou 31 Jul '10

31 Jul '10

Author: antoine.pitrou Date: Sun Aug 1 00:48:02 2010 New Revision: 83375 Log: Reorder entries by module lexicographic order Modified: python/branches/py3k/Doc/whatsnew/3.2.rst Modified: python/branches/py3k/Doc/whatsnew/3.2.rst ============================================================================== --- python/branches/py3k/Doc/whatsnew/3.2.rst (original) +++ python/branches/py3k/Doc/whatsnew/3.2.rst Sun Aug 1 00:48:02 2010 @@ -66,9 +66,41 @@ New, Improved, and Deprecated Modules ===================================== +* The previously deprecated :func:`contextlib.nested` function has been + removed in favor of a plain :keyword:`with` statement which can + accept multiple context managers. The latter technique is faster + (because it is built-in), and it does a better job finalizing multiple + context managers when one of them raises an exception. + + (Contributed by Georg Brandl and Mattias Brändström; + `appspot issue 53094 <http://codereview.appspot.com/53094>`_.) + * The :class:`ftplib.FTP` class now supports the context manager protocol (Contributed by Tarek Ziadé and Giampaolo Rodolà; :issue:`4972`.) +* The :func:`shutil.copytree` function has two new options: + + * *ignore_dangling_symlinks*: when ``symlinks=False`` (meaning that the + function copies the file pointed to by the symlink, not the symlink + itself) this option will silence the error thrown if the file doesn't + exist. + + * *copy_function*: a callable that will be used to copy files. + :func:`shutil.copy2` is used by default. + + (Contributed by Tarek Ziadé.) + +* The *sqlite3* module has some new features: + + * XXX *enable_load_extension* + + * XXX *load_extension* + + * New :class:`~sqlite3.Connection` attribute + :attr:`~sqlite3.Connection.in_transaction` is :const:`True` when there + are uncommitted changes, and :const:`False` otherwise. (Contributed + by R. David Murray and Shashwat Anand, :issue:`8845`.) + * The :mod:`ssl` module has a new class, :class:`~ssl.SSLContext` which serves as a container for various persistent SSL data, such as protocol settings, certificates, private keys, and various other options. @@ -110,38 +142,6 @@ (Contributed by Georg Brandl; :issue:`5675`.) -* The previously deprecated :func:`contextlib.nested` function has been - removed in favor of a plain :keyword:`with` statement which can - accept multiple context managers. The latter technique is faster - (because it is built-in), and it does a better job finalizing multiple - context managers when one of them raises an exception. - - (Contributed by Georg Brandl and Mattias Brändström; - `appspot issue 53094 <http://codereview.appspot.com/53094>`_.) - -* The :func:`shutil.copytree` function has two new options: - - * *ignore_dangling_symlinks*: when ``symlinks=False`` (meaning that the - function copies the file pointed to by the symlink, not the symlink - itself) this option will silence the error thrown if the file doesn't - exist. - - * *copy_function*: a callable that will be used to copy files. - :func:`shutil.copy2` is used by default. - - (Contributed by Tarek Ziade.) - -* The *sqlite3* module has some new features: - - * XXX *enable_load_extension* - - * XXX *load_extension* - - * New :class:`~sqlite3.Connection` attribute - :attr:`~sqlite3.Connection.in_transaction` is :const:`True` when there - are uncommitted changes, and :const:`False` otherwise. (Contributed - by R. David Murray and Shashwat Anand, :issue:`8845`.) - Multi-threading ===============

1 0

r83374 - in python/branches/py3k: Lib/imaplib.py Misc/NEWS
by georg.brandl 31 Jul '10

31 Jul '10

Author: georg.brandl Date: Sun Aug 1 00:32:52 2010 New Revision: 83374 Log: #5146: handle UID THREAD command correctly. Modified: python/branches/py3k/Lib/imaplib.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/imaplib.py ============================================================================== --- python/branches/py3k/Lib/imaplib.py (original) +++ python/branches/py3k/Lib/imaplib.py Sun Aug 1 00:32:52 2010 @@ -765,7 +765,7 @@ ', '.join(Commands[command]))) name = 'UID' typ, dat = self._simple_command(name, command, *args) - if command in ('SEARCH', 'SORT'): + if command in ('SEARCH', 'SORT', 'THREAD'): name = command else: name = 'FETCH' Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Aug 1 00:32:52 2010 @@ -15,6 +15,8 @@ Library ------- +- Issue #5146: Handle UID THREAD command correctly in imaplib. + - Issue #5147: Fix the header generated for cookie files written by http.cookiejar.MozillaCookieJar.

1 0

r83373 - in python/branches/py3k: Lib/http/cookiejar.py Misc/NEWS
by georg.brandl 31 Jul '10

31 Jul '10

Author: georg.brandl Date: Sun Aug 1 00:11:11 2010 New Revision: 83373 Log: #5147: revert accidental indentation of header constant for MozillaCookieJar. Modified: python/branches/py3k/Lib/http/cookiejar.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/http/cookiejar.py ============================================================================== --- python/branches/py3k/Lib/http/cookiejar.py (original) +++ python/branches/py3k/Lib/http/cookiejar.py Sun Aug 1 00:11:11 2010 @@ -1974,9 +1974,9 @@ """ magic_re = re.compile("#( Netscape)? HTTP Cookie File") header = """\ - # Netscape HTTP Cookie File - # http://www.netscape.com/newsref/std/cookie_spec.html - # This is a generated file! Do not edit. +# Netscape HTTP Cookie File +# http://www.netscape.com/newsref/std/cookie_spec.html +# This is a generated file! Do not edit. """ Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Aug 1 00:11:11 2010 @@ -15,6 +15,9 @@ Library ------- +- Issue #5147: Fix the header generated for cookie files written by + http.cookiejar.MozillaCookieJar. + - Issue #8198: In pydoc, output all help text to the correct stream when sys.stdout is reassigned.

1 0

r83372 - python/branches/py3k/Makefile.pre.in
by georg.brandl 31 Jul '10

31 Jul '10

Author: georg.brandl Date: Sun Aug 1 00:05:54 2010 New Revision: 83372 Log: #4007: remove *.a and *.so.X.Y files in "make clean". Modified: python/branches/py3k/Makefile.pre.in Modified: python/branches/py3k/Makefile.pre.in ============================================================================== --- python/branches/py3k/Makefile.pre.in (original) +++ python/branches/py3k/Makefile.pre.in Sun Aug 1 00:05:54 2010 @@ -1185,8 +1185,9 @@ -rm -rf Doc/tools/sphinx Doc/tools/pygments Doc/tools/docutils clean: pycremoval - find . -name '*.o' -exec rm -f {} ';' + find . -name '*.[oa]' -exec rm -f {} ';' find . -name '*.s[ol]' -exec rm -f {} ';' + find . -name '*.so.[0-9]*.[0-9]*' -exec rm -f {} ';' find build -name 'fficonfig.h' -exec rm -f {} ';' || true find build -name 'fficonfig.py' -exec rm -f {} ';' || true -rm -f Lib/lib2to3/*Grammar*.pickle

1 0

r83371 - in python/branches/py3k/Lib: distutils/command/sdist.py http/server.py platform.py
by georg.brandl 31 Jul '10

31 Jul '10

Author: georg.brandl Date: Sat Jul 31 23:54:24 2010 New Revision: 83371 Log: #8292: Fix three instances of truth tests on return values of filter() (which is always true in Python 3). Modified: python/branches/py3k/Lib/distutils/command/sdist.py python/branches/py3k/Lib/http/server.py python/branches/py3k/Lib/platform.py Modified: python/branches/py3k/Lib/distutils/command/sdist.py ============================================================================== --- python/branches/py3k/Lib/distutils/command/sdist.py (original) +++ python/branches/py3k/Lib/distutils/command/sdist.py Sat Jul 31 23:54:24 2010 @@ -240,8 +240,7 @@ optional = ['test/test*.py', 'setup.cfg'] for pattern in optional: files = filter(os.path.isfile, glob(pattern)) - if files: - self.filelist.extend(files) + self.filelist.extend(files) # build_py is used to get: # - python modules Modified: python/branches/py3k/Lib/http/server.py ============================================================================== --- python/branches/py3k/Lib/http/server.py (original) +++ python/branches/py3k/Lib/http/server.py Sat Jul 31 23:54:24 2010 @@ -1023,8 +1023,9 @@ if ua: env['HTTP_USER_AGENT'] = ua co = filter(None, self.headers.get_all('cookie', [])) - if co: - env['HTTP_COOKIE'] = ', '.join(co) + cookie_str = ', '.join(co) + if cookie_str: + env['HTTP_COOKIE'] = cookie_str # XXX Other HTTP_* headers # Since we're setting the env in the parent, provide empty # values to override previously set values Modified: python/branches/py3k/Lib/platform.py ============================================================================== --- python/branches/py3k/Lib/platform.py (original) +++ python/branches/py3k/Lib/platform.py Sat Jul 31 23:54:24 2010 @@ -1137,7 +1137,7 @@ except AttributeError: no_os_uname = 1 - if no_os_uname or not filter(None, (system, node, release, version, machine)): + if no_os_uname or not list(filter(None, (system, node, release, version, machine))): # Hmm, no there is either no uname or uname has returned #'unknowns'... we'll have to poke around the system then. if no_os_uname:

1 0

r83370 - in python/branches/py3k: Lib/pydoc.py Misc/NEWS
by georg.brandl 31 Jul '10

31 Jul '10

Author: georg.brandl Date: Sat Jul 31 23:51:48 2010 New Revision: 83370 Log: #8198: the Helper class should not save the stdin and stdout objects at import time, rather by default use the current streams like the other APIs that output help. Modified: python/branches/py3k/Lib/pydoc.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/pydoc.py ============================================================================== --- python/branches/py3k/Lib/pydoc.py (original) +++ python/branches/py3k/Lib/pydoc.py Sat Jul 31 23:51:48 2010 @@ -1695,9 +1695,17 @@ 'CONTEXTMANAGERS': ('context-managers', 'with'), } - def __init__(self, input, output): - self.input = input - self.output = output + def __init__(self, input=None, output=None): + self._input = input + self._output = output + + @property + def input(self): + return self._input or sys.stdin + + @property + def output(self): + return self._output or sys.stdout def __repr__(self): if inspect.stack()[1][3] == '?': @@ -1874,7 +1882,7 @@ for modules whose descriptions contain the word "spam". ''') -help = Helper(sys.stdin, sys.stdout) +help = Helper() class Scanner: """A generic tree iterator.""" Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sat Jul 31 23:51:48 2010 @@ -15,6 +15,9 @@ Library ------- +- Issue #8198: In pydoc, output all help text to the correct stream + when sys.stdout is reassigned. + - Issue #7909: Do not touch paths with the special prefixes ``\\.\`` or ``\\?\`` in ntpath.normpath().

1 0

r83369 - in python/branches/py3k: Doc/library/dbm.rst Misc/NEWS
by georg.brandl 31 Jul '10

31 Jul '10

Author: georg.brandl Date: Sat Jul 31 23:41:42 2010 New Revision: 83369 Log: Fix "Berkeley" name. Modified: python/branches/py3k/Doc/library/dbm.rst python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Doc/library/dbm.rst ============================================================================== --- python/branches/py3k/Doc/library/dbm.rst (original) +++ python/branches/py3k/Doc/library/dbm.rst Sat Jul 31 23:41:42 2010 @@ -8,7 +8,7 @@ :mod:`dbm.gnu` or :mod:`dbm.ndbm`. If none of these modules is installed, the slow-but-simple implementation in module :mod:`dbm.dumb` will be used. There is a `third party interface <http://www.jcea.es/programacion/pybsddb.htm>`_ to -the Oracle Berkely DB. +the Oracle Berkeley DB. .. exception:: error Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sat Jul 31 23:41:42 2010 @@ -2393,8 +2393,8 @@ an error. The _PY_STRUCT_FLOAT_COERCE constant has been removed. The version number has been bumped to 0.3. -- Issue #5359: Readd the Berkley-DB detection code to allow _dbm be built - using Berkley-DB. +- Issue #5359: Readd the Berkeley DB detection code to allow _dbm be built + using Berkeley DB. Tests -----

1 0

r83368 - in python/branches/py3k: Lib/ntpath.py Lib/test/test_ntpath.py Misc/NEWS
by georg.brandl 31 Jul '10

31 Jul '10

Author: georg.brandl Date: Sat Jul 31 23:40:15 2010 New Revision: 83368 Log: #7909: the prefixes \\.\ and \\?\ indicate special Windows paths, do not try to manipulate them. See http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx for details. Modified: python/branches/py3k/Lib/ntpath.py python/branches/py3k/Lib/test/test_ntpath.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/ntpath.py ============================================================================== --- python/branches/py3k/Lib/ntpath.py (original) +++ python/branches/py3k/Lib/ntpath.py Sat Jul 31 23:40:15 2010 @@ -71,6 +71,12 @@ else: return ':' +def _get_special(path): + if isinstance(path, bytes): + return (b'\\\\.\\', b'\\\\?\\') + else: + return ('\\\\.\\', '\\\\?\\') + # Normalize the case of a pathname and map slashes to backslashes. # Other normalizations (such as optimizing '../' away) are not done # (this is done by normpath). @@ -524,6 +530,13 @@ """Normalize path, eliminating double slashes, etc.""" sep = _get_sep(path) dotdot = _get_dot(path) * 2 + special_prefixes = _get_special(path) + if path.startswith(special_prefixes): + # in the case of paths with these prefixes: + # \\.\ -> device names + # \\?\ -> literal paths + # do not do any normalization, but return the path unchanged + return path path = path.replace(_get_altsep(path), sep) prefix, path = splitdrive(path) Modified: python/branches/py3k/Lib/test/test_ntpath.py ============================================================================== --- python/branches/py3k/Lib/test/test_ntpath.py (original) +++ python/branches/py3k/Lib/test/test_ntpath.py Sat Jul 31 23:40:15 2010 @@ -174,6 +174,9 @@ tester("ntpath.normpath('C:////a/b')", r'C:\a\b') tester("ntpath.normpath('//machine/share//a/b')", r'\\machine\share\a\b') + tester("ntpath.normpath('\\\\.\\NUL')", r'\\.\NUL') + tester("ntpath.normpath('\\\\?\\D:/XY\\Z')", r'\\?\D:/XY\Z') + def test_expandvars(self): with support.EnvironmentVarGuard() as env: env.clear() Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sat Jul 31 23:40:15 2010 @@ -15,6 +15,9 @@ Library ------- +- Issue #7909: Do not touch paths with the special prefixes ``\\.\`` + or ``\\?\`` in ntpath.normpath(). + - Issue #1286: Allow using fileinput.FileInput as a context manager. - Add lfu_cache() and lru_cache() decorators to the functools module.

1 0

r83367 - python/branches/import_unicode/Parser/tokenizer.c
by victor.stinner 31 Jul '10

31 Jul '10

Author: victor.stinner Date: Sat Jul 31 23:33:40 2010 New Revision: 83367 Log: PyObject_CallMethod(): use 'N' format instead of 'O' format to avoid Py_DECREF(). Modified: python/branches/import_unicode/Parser/tokenizer.c Modified: python/branches/import_unicode/Parser/tokenizer.c ============================================================================== --- python/branches/import_unicode/Parser/tokenizer.c (original) +++ python/branches/import_unicode/Parser/tokenizer.c Sat Jul 31 23:33:40 2010 @@ -471,9 +471,8 @@ PyObject *filename = PyUnicode_DecodeFSDefault(tok->filename); if (filename == NULL) goto cleanup; - stream = PyObject_CallMethod(io, "open", "Osis", + stream = PyObject_CallMethod(io, "open", "Nsis", filename, "r", -1, enc); - Py_DECREF(filename); } else stream = PyObject_CallMethod(io, "open", "isisOOO",

1 0