Mailman 3 January 2012 - Python-checkins

cpython (merge default -> default): Merge
by brett.cannon Jan. 26, 2012

Jan. 26, 2012

http://hg.python.org/cpython/rev/93075fb1360a changeset: 74631:93075fb1360a parent: 74629:d2cf8a34ddf9 parent: 74630:7d8f016784cd user: Brett Cannon <brett(a)python.org> date: Thu Jan 26 08:58:19 2012 -0500 summary: Merge files: Lib/importlib/__init__.py | 43 ++------- Lib/importlib/_bootstrap.py | 39 ++++++++- Lib/importlib/abc.py | 4 +- Lib/importlib/test/source/test_abc_loader.py | 8 +- 4 files changed, 52 insertions(+), 42 deletions(-) diff --git a/Lib/importlib/__init__.py b/Lib/importlib/__init__.py --- a/Lib/importlib/__init__.py +++ b/Lib/importlib/__init__.py @@ -26,8 +26,15 @@ import re import tokenize +# To simplify imports in test code +_w_long = _bootstrap._w_long +_r_long = _bootstrap._r_long + + # Bootstrap help ##################################################### +# TODO: Expose from import.c, else handle encode/decode as _os.environ returns +# bytes. def _case_ok(directory, check): """Check if the directory contains something matching 'check'. @@ -36,37 +43,13 @@ """ if 'PYTHONCASEOK' in os.environ: return True - elif check in os.listdir(directory if directory else os.getcwd()): + if not directory: + directory = os.getcwd() + if check in os.listdir(directory): return True return False - -def _w_long(x): - """Convert a 32-bit integer to little-endian. - - XXX Temporary until marshal's long functions are exposed. - - """ - x = int(x) - int_bytes = [] - int_bytes.append(x & 0xFF) - int_bytes.append((x >> 8) & 0xFF) - int_bytes.append((x >> 16) & 0xFF) - int_bytes.append((x >> 24) & 0xFF) - return bytearray(int_bytes) - - -def _r_long(int_bytes): - """Convert 4 bytes in little-endian to an integer. - - XXX Temporary until marshal's long function are exposed. - - """ - x = int_bytes[0] - x |= int_bytes[1] << 8 - x |= int_bytes[2] << 16 - x |= int_bytes[3] << 24 - return x +_bootstrap._case_ok = _case_ok # Required built-in modules. @@ -94,10 +77,6 @@ # For os.path.join replacement; pull from Include/osdefs.h:SEP . _bootstrap.path_sep = sep -_bootstrap._case_ok = _case_ok -marshal._w_long = _w_long -marshal._r_long = _r_long - # Public API ######################################################### diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -18,6 +18,37 @@ # Bootstrap-related code ###################################################### +# TODO: Expose from marshal +def _w_long(x): + """Convert a 32-bit integer to little-endian. + + XXX Temporary until marshal's long functions are exposed. + + """ + x = int(x) + int_bytes = [] + int_bytes.append(x & 0xFF) + int_bytes.append((x >> 8) & 0xFF) + int_bytes.append((x >> 16) & 0xFF) + int_bytes.append((x >> 24) & 0xFF) + return bytearray(int_bytes) + + +# TODO: Expose from marshal +def _r_long(int_bytes): + """Convert 4 bytes in little-endian to an integer. + + XXX Temporary until marshal's long function are exposed. + + """ + x = int_bytes[0] + x |= int_bytes[1] << 8 + x |= int_bytes[2] << 16 + x |= int_bytes[3] << 24 + return x + + + # XXX Could also expose Modules/getpath.c:joinpath() def _path_join(*args): """Replacement for os.path.join.""" @@ -353,14 +384,14 @@ except KeyError: pass else: - if marshal._r_long(raw_timestamp) != source_mtime: + if _r_long(raw_timestamp) != source_mtime: raise ImportError("bytecode is stale for {}".format(fullname)) try: source_size = source_stats['size'] & 0xFFFFFFFF except KeyError: pass else: - if marshal._r_long(raw_size) != source_size: + if _r_long(raw_size) != source_size: raise ImportError("bytecode is stale for {}".format(fullname)) # Can't return the code object as errors from marshal loading need to # propagate even when source is available. @@ -472,8 +503,8 @@ # their own cached file format, this block of code will most likely # throw an exception. data = bytearray(imp.get_magic()) - data.extend(marshal._w_long(source_mtime)) - data.extend(marshal._w_long(len(source_bytes))) + data.extend(_w_long(source_mtime)) + data.extend(_w_long(len(source_bytes))) data.extend(marshal.dumps(code_object)) try: self.set_data(bytecode_path, data) diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py --- a/Lib/importlib/abc.py +++ b/Lib/importlib/abc.py @@ -260,7 +260,7 @@ raw_timestamp = data[4:8] if len(raw_timestamp) < 4: raise EOFError("bad timestamp in {}".format(fullname)) - pyc_timestamp = marshal._r_long(raw_timestamp) + pyc_timestamp = _bootstrap._r_long(raw_timestamp) bytecode = data[8:] # Verify that the magic number is valid. if imp.get_magic() != magic: @@ -292,7 +292,7 @@ # Generate bytecode and write it out. if not sys.dont_write_bytecode: data = bytearray(imp.get_magic()) - data.extend(marshal._w_long(source_timestamp)) + data.extend(_bootstrap._w_long(source_timestamp)) data.extend(marshal.dumps(code_object)) self.write_bytecode(fullname, data) return code_object diff --git a/Lib/importlib/test/source/test_abc_loader.py b/Lib/importlib/test/source/test_abc_loader.py --- a/Lib/importlib/test/source/test_abc_loader.py +++ b/Lib/importlib/test/source/test_abc_loader.py @@ -42,8 +42,8 @@ self.bytecode_path = imp.cache_from_source(self.path) self.source_size = len(self.source) data = bytearray(magic) - data.extend(marshal._w_long(self.source_mtime)) - data.extend(marshal._w_long(self.source_size)) + data.extend(importlib._w_long(self.source_mtime)) + data.extend(importlib._w_long(self.source_size)) code_object = compile(self.source, self.path, 'exec', dont_inherit=True) data.extend(marshal.dumps(code_object)) @@ -658,8 +658,8 @@ if bytecode_written: self.assertIn(self.cached, self.loader.written) data = bytearray(imp.get_magic()) - data.extend(marshal._w_long(self.loader.source_mtime)) - data.extend(marshal._w_long(self.loader.source_size)) + data.extend(importlib._w_long(self.loader.source_mtime)) + data.extend(importlib._w_long(self.loader.source_size)) data.extend(marshal.dumps(code_object)) self.assertEqual(self.loader.written[self.cached], bytes(data)) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Move some code from importlib.__init__ to importlib._bootstrap that
by brett.cannon Jan. 26, 2012

Jan. 26, 2012

http://hg.python.org/cpython/rev/7d8f016784cd changeset: 74630:7d8f016784cd parent: 74624:e68ddfc193d5 user: Brett Cannon <brett(a)python.org> date: Wed Jan 25 18:58:03 2012 -0500 summary: Move some code from importlib.__init__ to importlib._bootstrap that does not need to be exposed from C code for bootstrapping reasons. files: Lib/importlib/__init__.py | 43 ++------- Lib/importlib/_bootstrap.py | 39 ++++++++- Lib/importlib/abc.py | 4 +- Lib/importlib/test/source/test_abc_loader.py | 8 +- 4 files changed, 52 insertions(+), 42 deletions(-) diff --git a/Lib/importlib/__init__.py b/Lib/importlib/__init__.py --- a/Lib/importlib/__init__.py +++ b/Lib/importlib/__init__.py @@ -26,8 +26,15 @@ import re import tokenize +# To simplify imports in test code +_w_long = _bootstrap._w_long +_r_long = _bootstrap._r_long + + # Bootstrap help ##################################################### +# TODO: Expose from import.c, else handle encode/decode as _os.environ returns +# bytes. def _case_ok(directory, check): """Check if the directory contains something matching 'check'. @@ -36,37 +43,13 @@ """ if 'PYTHONCASEOK' in os.environ: return True - elif check in os.listdir(directory if directory else os.getcwd()): + if not directory: + directory = os.getcwd() + if check in os.listdir(directory): return True return False - -def _w_long(x): - """Convert a 32-bit integer to little-endian. - - XXX Temporary until marshal's long functions are exposed. - - """ - x = int(x) - int_bytes = [] - int_bytes.append(x & 0xFF) - int_bytes.append((x >> 8) & 0xFF) - int_bytes.append((x >> 16) & 0xFF) - int_bytes.append((x >> 24) & 0xFF) - return bytearray(int_bytes) - - -def _r_long(int_bytes): - """Convert 4 bytes in little-endian to an integer. - - XXX Temporary until marshal's long function are exposed. - - """ - x = int_bytes[0] - x |= int_bytes[1] << 8 - x |= int_bytes[2] << 16 - x |= int_bytes[3] << 24 - return x +_bootstrap._case_ok = _case_ok # Required built-in modules. @@ -94,10 +77,6 @@ # For os.path.join replacement; pull from Include/osdefs.h:SEP . _bootstrap.path_sep = sep -_bootstrap._case_ok = _case_ok -marshal._w_long = _w_long -marshal._r_long = _r_long - # Public API ######################################################### diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -18,6 +18,37 @@ # Bootstrap-related code ###################################################### +# TODO: Expose from marshal +def _w_long(x): + """Convert a 32-bit integer to little-endian. + + XXX Temporary until marshal's long functions are exposed. + + """ + x = int(x) + int_bytes = [] + int_bytes.append(x & 0xFF) + int_bytes.append((x >> 8) & 0xFF) + int_bytes.append((x >> 16) & 0xFF) + int_bytes.append((x >> 24) & 0xFF) + return bytearray(int_bytes) + + +# TODO: Expose from marshal +def _r_long(int_bytes): + """Convert 4 bytes in little-endian to an integer. + + XXX Temporary until marshal's long function are exposed. + + """ + x = int_bytes[0] + x |= int_bytes[1] << 8 + x |= int_bytes[2] << 16 + x |= int_bytes[3] << 24 + return x + + + # XXX Could also expose Modules/getpath.c:joinpath() def _path_join(*args): """Replacement for os.path.join.""" @@ -353,14 +384,14 @@ except KeyError: pass else: - if marshal._r_long(raw_timestamp) != source_mtime: + if _r_long(raw_timestamp) != source_mtime: raise ImportError("bytecode is stale for {}".format(fullname)) try: source_size = source_stats['size'] & 0xFFFFFFFF except KeyError: pass else: - if marshal._r_long(raw_size) != source_size: + if _r_long(raw_size) != source_size: raise ImportError("bytecode is stale for {}".format(fullname)) # Can't return the code object as errors from marshal loading need to # propagate even when source is available. @@ -472,8 +503,8 @@ # their own cached file format, this block of code will most likely # throw an exception. data = bytearray(imp.get_magic()) - data.extend(marshal._w_long(source_mtime)) - data.extend(marshal._w_long(len(source_bytes))) + data.extend(_w_long(source_mtime)) + data.extend(_w_long(len(source_bytes))) data.extend(marshal.dumps(code_object)) try: self.set_data(bytecode_path, data) diff --git a/Lib/importlib/abc.py b/Lib/importlib/abc.py --- a/Lib/importlib/abc.py +++ b/Lib/importlib/abc.py @@ -260,7 +260,7 @@ raw_timestamp = data[4:8] if len(raw_timestamp) < 4: raise EOFError("bad timestamp in {}".format(fullname)) - pyc_timestamp = marshal._r_long(raw_timestamp) + pyc_timestamp = _bootstrap._r_long(raw_timestamp) bytecode = data[8:] # Verify that the magic number is valid. if imp.get_magic() != magic: @@ -292,7 +292,7 @@ # Generate bytecode and write it out. if not sys.dont_write_bytecode: data = bytearray(imp.get_magic()) - data.extend(marshal._w_long(source_timestamp)) + data.extend(_bootstrap._w_long(source_timestamp)) data.extend(marshal.dumps(code_object)) self.write_bytecode(fullname, data) return code_object diff --git a/Lib/importlib/test/source/test_abc_loader.py b/Lib/importlib/test/source/test_abc_loader.py --- a/Lib/importlib/test/source/test_abc_loader.py +++ b/Lib/importlib/test/source/test_abc_loader.py @@ -42,8 +42,8 @@ self.bytecode_path = imp.cache_from_source(self.path) self.source_size = len(self.source) data = bytearray(magic) - data.extend(marshal._w_long(self.source_mtime)) - data.extend(marshal._w_long(self.source_size)) + data.extend(importlib._w_long(self.source_mtime)) + data.extend(importlib._w_long(self.source_size)) code_object = compile(self.source, self.path, 'exec', dont_inherit=True) data.extend(marshal.dumps(code_object)) @@ -658,8 +658,8 @@ if bytecode_written: self.assertIn(self.cached, self.loader.written) data = bytearray(imp.get_magic()) - data.extend(marshal._w_long(self.loader.source_mtime)) - data.extend(marshal._w_long(self.loader.source_size)) + data.extend(importlib._w_long(self.loader.source_mtime)) + data.extend(importlib._w_long(self.loader.source_size)) data.extend(marshal.dumps(code_object)) self.assertEqual(self.loader.written[self.cached], bytes(data)) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue 13870: Fix out of date comment.
by raymond.hettinger Jan. 26, 2012

Jan. 26, 2012

http://hg.python.org/cpython/rev/f7283825effa changeset: 74628:f7283825effa branch: 3.2 parent: 74623:5b8800012e88 user: Raymond Hettinger <python(a)rcn.com> date: Thu Jan 26 00:14:16 2012 -0800 summary: Issue 13870: Fix out of date comment. files: Lib/collections.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/collections.py b/Lib/collections.py --- a/Lib/collections.py +++ b/Lib/collections.py @@ -33,7 +33,7 @@ # The circular doubly linked list starts and ends with a sentinel element. # The sentinel element never gets deleted (this simplifies the algorithm). # The sentinel is in self.__hardroot with a weakref proxy in self.__root. - # The prev/next links are weakref proxies (to prevent circular references). + # The prev links are weakref proxies (to prevent circular references). # Individual links are kept alive by the hard reference in self.__map. # Those hard references disappear when a key is deleted from an OrderedDict. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge
by raymond.hettinger Jan. 26, 2012

Jan. 26, 2012

http://hg.python.org/cpython/rev/d2cf8a34ddf9 changeset: 74629:d2cf8a34ddf9 parent: 74627:e12b8d3a3d03 parent: 74628:f7283825effa user: Raymond Hettinger <python(a)rcn.com> date: Thu Jan 26 00:15:07 2012 -0800 summary: Merge files: Lib/collections/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/collections/__init__.py b/Lib/collections/__init__.py --- a/Lib/collections/__init__.py +++ b/Lib/collections/__init__.py @@ -34,7 +34,7 @@ # The circular doubly linked list starts and ends with a sentinel element. # The sentinel element never gets deleted (this simplifies the algorithm). # The sentinel is in self.__hardroot with a weakref proxy in self.__root. - # The prev/next links are weakref proxies (to prevent circular references). + # The prev links are weakref proxies (to prevent circular references). # Individual links are kept alive by the hard reference in self.__map. # Those hard references disappear when a key is deleted from an OrderedDict. -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (e12b8d3a3d03): sum=0
by solipsis＠pitrou.net Jan. 26, 2012

Jan. 26, 2012

results for e12b8d3a3d03 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog0qmJgz', '-x']

1 0

cpython: Remove now useless arbitrary limit of module name length
by victor.stinner Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/e12b8d3a3d03 changeset: 74627:e12b8d3a3d03 parent: 74624:e68ddfc193d5 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Jan 26 00:31:49 2012 +0100 summary: Remove now useless arbitrary limit of module name length files: Python/import.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/Python/import.c b/Python/import.c --- a/Python/import.c +++ b/Python/import.c @@ -2052,12 +2052,6 @@ if (p_loader != NULL) *p_loader = NULL; - if (PyUnicode_GET_LENGTH(name) > MAXPATHLEN) { - PyErr_SetString(PyExc_OverflowError, - "module name is too long"); - return NULL; - } - /* sys.meta_path import hook */ if (p_loader != NULL) { _Py_IDENTIFIER(find_module); -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 2.7 -> 2.7): merge heads
by benjamin.peterson Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/232c7d73b09d changeset: 74626:232c7d73b09d branch: 2.7 parent: 74625:9133d956b3ce parent: 74622:e2b98a332070 user: Benjamin Peterson <benjamin(a)python.org> date: Wed Jan 25 16:43:54 2012 -0500 summary: merge heads files: Doc/library/functools.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst --- a/Doc/library/functools.rst +++ b/Doc/library/functools.rst @@ -1,8 +1,8 @@ -:mod:`functools` --- Higher order functions and operations on callable objects +:mod:`functools` --- Higher-order functions and operations on callable objects ============================================================================== .. module:: functools - :synopsis: Higher order functions and operations on callable objects. + :synopsis: Higher-order functions and operations on callable objects. .. moduleauthor:: Peter Harris <scav(a)blueyonder.co.uk> .. moduleauthor:: Raymond Hettinger <python(a)rcn.com> .. moduleauthor:: Nick Coghlan <ncoghlan(a)gmail.com> @@ -29,7 +29,7 @@ tool for programs being converted to Python 3 where comparison functions are no longer supported. - A compare function is any callable that accept two arguments, compares them, + A comparison function is any callable that accept two arguments, compares them, and returns a negative number for less-than, zero for equality, or a positive number for greater-than. A key function is a callable that accepts one argument and returns another value that indicates the position in the desired -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): forgot to resolve this conflict...
by benjamin.peterson Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/9133d956b3ce changeset: 74625:9133d956b3ce branch: 2.7 parent: 74619:ed6d9249da0c user: Benjamin Peterson <benjamin(a)python.org> date: Wed Jan 25 16:43:26 2012 -0500 summary: forgot to resolve this conflict... files: Doc/library/stdtypes.rst | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -422,12 +422,8 @@ operations and higher than the comparisons; the unary operation ``~`` has the same priority as the other unary numeric operations (``+`` and ``-``). -<<<<<<< local -This table lists the bit-string operations sorted in ascending priority: -======= This table lists the bitwise operations sorted in ascending priority (operations in the same box have the same priority): ->>>>>>> other +------------+--------------------------------+----------+ | Operation | Result | Notes | -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): merge with 3.2
by georg.brandl Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/e68ddfc193d5 changeset: 74624:e68ddfc193d5 parent: 74621:2701a2bb19c5 parent: 74623:5b8800012e88 user: Georg Brandl <georg(a)python.org> date: Wed Jan 25 22:36:43 2012 +0100 summary: merge with 3.2 files: Doc/library/functools.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst --- a/Doc/library/functools.rst +++ b/Doc/library/functools.rst @@ -1,8 +1,8 @@ -:mod:`functools` --- Higher order functions and operations on callable objects +:mod:`functools` --- Higher-order functions and operations on callable objects ============================================================================== .. module:: functools - :synopsis: Higher order functions and operations on callable objects. + :synopsis: Higher-order functions and operations on callable objects. .. moduleauthor:: Peter Harris <scav(a)blueyonder.co.uk> .. moduleauthor:: Raymond Hettinger <python(a)rcn.com> .. moduleauthor:: Nick Coghlan <ncoghlan(a)gmail.com> @@ -27,7 +27,7 @@ tool for programs being converted from Python 2 which supported the use of comparison functions. - A compare function is any callable that accept two arguments, compares them, + A comparison function is any callable that accept two arguments, compares them, and returns a negative number for less-than, zero for equality, or a positive number for greater-than. A key function is a callable that accepts one argument and returns another value indicating the position in the desired -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): #13852: some small doc fixes.
by georg.brandl Jan. 25, 2012

Jan. 25, 2012

http://hg.python.org/cpython/rev/5b8800012e88 changeset: 74623:5b8800012e88 branch: 3.2 parent: 74617:2790c3ff475b user: Georg Brandl <georg(a)python.org> date: Wed Jan 25 22:36:25 2012 +0100 summary: #13852: some small doc fixes. files: Doc/library/functools.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/functools.rst b/Doc/library/functools.rst --- a/Doc/library/functools.rst +++ b/Doc/library/functools.rst @@ -1,8 +1,8 @@ -:mod:`functools` --- Higher order functions and operations on callable objects +:mod:`functools` --- Higher-order functions and operations on callable objects ============================================================================== .. module:: functools - :synopsis: Higher order functions and operations on callable objects. + :synopsis: Higher-order functions and operations on callable objects. .. moduleauthor:: Peter Harris <scav(a)blueyonder.co.uk> .. moduleauthor:: Raymond Hettinger <python(a)rcn.com> .. moduleauthor:: Nick Coghlan <ncoghlan(a)gmail.com> @@ -27,7 +27,7 @@ tool for programs being converted from Python 2 which supported the use of comparison functions. - A compare function is any callable that accept two arguments, compares them, + A comparison function is any callable that accept two arguments, compares them, and returns a negative number for less-than, zero for equality, or a positive number for greater-than. A key function is a callable that accepts one argument and returns another value indicating the position in the desired -- Repository URL: http://hg.python.org/cpython

1 0