Mailman 3 November 2013 - Python-checkins

cpython: Issue #19410: Put back in special-casing of '' for
by brett.cannon Nov. 1, 2013

Nov. 1, 2013

http://hg.python.org/cpython/rev/17d730d37b2f changeset: 86823:17d730d37b2f user: Brett Cannon <brett(a)python.org> date: Fri Nov 01 10:37:57 2013 -0400 summary: Issue #19410: Put back in special-casing of '' for importlib.machinery.FileFinder. While originally moved to stop special-casing '' as PathFinder farther up the typical call chain now uses the cwd in the instance of '', it was deemed an unnecessary risk to breaking subclasses of FileFinder to take the special-casing out. files: Doc/library/importlib.rst | 3 - Doc/whatsnew/3.4.rst | 3 - Lib/importlib/_bootstrap.py | 2 +- Misc/NEWS | 3 + Python/importlib.h | 1586 +++++++++++----------- 5 files changed, 797 insertions(+), 800 deletions(-) diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst @@ -753,9 +753,6 @@ .. versionadded:: 3.3 - .. versionchanged:: 3.4 - The empty string is no longer special-cased to be changed into ``'.'``. - .. attribute:: path The path the finder will search in. diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst --- a/Doc/whatsnew/3.4.rst +++ b/Doc/whatsnew/3.4.rst @@ -812,6 +812,3 @@ working directory will also now have an absolute path, including when using ``-m`` with the interpreter (this does not influence when the path to a file is specified on the command-line). - -* :class:`importlib.machinery.FileFinder` no longer special-cases the empty string - to be changed to ``'.'``. diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1375,7 +1375,7 @@ loaders.extend((suffix, loader) for suffix in suffixes) self._loaders = loaders # Base (directory) path - self.path = path + self.path = path or '.' self._path_mtime = -1 self._path_cache = set() self._relaxed_path_cache = set() diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -31,6 +31,9 @@ Library ------- +- Issue #19410: Undo the special-casing removal of '' for + importlib.machinery.FileFinder. + - Issue #19424: Fix the warnings module to accept filename containing surrogate characters. diff --git a/Python/importlib.h b/Python/importlib.h --- a/Python/importlib.h +++ b/Python/importlib.h [stripped] -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Silence a compiler warning about an unused function
by brett.cannon Nov. 1, 2013

Nov. 1, 2013

http://hg.python.org/cpython/rev/b59ef5f203da changeset: 86822:b59ef5f203da user: Brett Cannon <brett(a)python.org> date: Fri Nov 01 10:25:13 2013 -0400 summary: Silence a compiler warning about an unused function files: Modules/_hashopenssl.c | 56 +++++++++++++++--------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -63,34 +63,6 @@ DEFINE_CONSTS_FOR_NEW(sha512) #endif -static PyObject * -_setException(PyObject *exc) -{ - unsigned long errcode; - const char *lib, *func, *reason; - - errcode = ERR_peek_last_error(); - if (!errcode) { - PyErr_SetString(exc, "unknown reasons"); - return NULL; - } - ERR_clear_error(); - - lib = ERR_lib_error_string(errcode); - func = ERR_func_error_string(errcode); - reason = ERR_reason_error_string(errcode); - - if (lib && func) { - PyErr_Format(exc, "[%s: %s] %s", lib, func, reason); - } - else if (lib) { - PyErr_Format(exc, "[%s] %s", lib, reason); - } - else { - PyErr_SetString(exc, reason); - } - return NULL; -} static EVPobject * newEVPobject(PyObject *name) @@ -588,6 +560,34 @@ return 1; } +static PyObject * +_setException(PyObject *exc) +{ + unsigned long errcode; + const char *lib, *func, *reason; + + errcode = ERR_peek_last_error(); + if (!errcode) { + PyErr_SetString(exc, "unknown reasons"); + return NULL; + } + ERR_clear_error(); + + lib = ERR_lib_error_string(errcode); + func = ERR_func_error_string(errcode); + reason = ERR_reason_error_string(errcode); + + if (lib && func) { + PyErr_Format(exc, "[%s: %s] %s", lib, func, reason); + } + else if (lib) { + PyErr_Format(exc, "[%s] %s", lib, reason); + } + else { + PyErr_SetString(exc, reason); + } + return NULL; +} PyDoc_STRVAR(pbkdf2_hmac__doc__, "pbkdf2_hmac(hash_name, password, salt, iterations, dklen=None) -> key\n\ -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #19464 Suppress compiler warnings during clean. Patch by Zachary Ware.
by tim.golden Nov. 1, 2013

Nov. 1, 2013

http://hg.python.org/cpython/rev/599b5200ad51 changeset: 86821:599b5200ad51 user: Tim Golden <mail(a)timgolden.me.uk> date: Fri Nov 01 13:12:17 2013 +0000 summary: Issue #19464 Suppress compiler warnings during clean. Patch by Zachary Ware. files: PCbuild/ssl.vcxproj | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/PCbuild/ssl.vcxproj b/PCbuild/ssl.vcxproj --- a/PCbuild/ssl.vcxproj +++ b/PCbuild/ssl.vcxproj @@ -122,7 +122,7 @@ "$(PythonExe)" build_ssl.py Release $(Platform) -a </NMakeBuildCommandLine> <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> - <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> + <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo OpenSSL must be cleaned manually if you want to rebuild it.</NMakeCleanCommandLine> <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath> @@ -133,7 +133,7 @@ "$(PythonExe)" build_ssl.py Release $(Platform) -a </NMakeBuildCommandLine> <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> - <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> + <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo OpenSSL must be cleaned manually if you want to rebuild it.</NMakeCleanCommandLine> <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath> @@ -144,7 +144,7 @@ "$(PythonExe)" build_ssl.py Release $(Platform) -a </NMakeBuildCommandLine> <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> - <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> + <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo OpenSSL must be cleaned manually if you want to rebuild it.</NMakeCleanCommandLine> <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath> @@ -155,7 +155,7 @@ "$(PythonExe)" build_ssl.py Release $(Platform) -a </NMakeBuildCommandLine> <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> + <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo OpenSSL must be cleaned manually if you want to rebuild it.</NMakeCleanCommandLine> <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath> @@ -166,7 +166,7 @@ "$(PythonExe)" build_ssl.py Release $(Platform) -a </NMakeBuildCommandLine> <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" /> - <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" /> + <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">echo OpenSSL must be cleaned manually if you want to rebuild it.</NMakeCleanCommandLine> <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'" /> <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath> @@ -177,7 +177,7 @@ "$(PythonExe)" build_ssl.py Release $(Platform) -a </NMakeBuildCommandLine> <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" /> - <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" /> + <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">echo OpenSSL must be cleaned manually if you want to rebuild it.</NMakeCleanCommandLine> <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'" /> <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='PGInstrument|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath> @@ -188,7 +188,7 @@ "$(PythonExe)" build_ssl.py Release $(Platform) -a </NMakeBuildCommandLine> <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" /> - <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" /> + <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">echo OpenSSL must be cleaned manually if you want to rebuild it.</NMakeCleanCommandLine> <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'" /> <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath> @@ -199,7 +199,7 @@ "$(PythonExe)" build_ssl.py Release $(Platform) -a </NMakeBuildCommandLine> <NMakeReBuildCommandLine Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" /> - <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" /> + <NMakeCleanCommandLine Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">echo OpenSSL must be cleaned manually if you want to rebuild it.</NMakeCleanCommandLine> <NMakeOutput Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'" /> <NMakePreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions> <NMakeIncludeSearchPath Condition="'$(Configuration)|$(Platform)'=='PGUpdate|x64'">$(NMakeIncludeSearchPath)</NMakeIncludeSearchPath> -- Repository URL: http://hg.python.org/cpython

1 0

peps: PEP 454
by victor.stinner Nov. 1, 2013

Nov. 1, 2013

http://hg.python.org/peps/rev/50539da3ea22 changeset: 5241:50539da3ea22 user: Victor Stinner <victor.stinner(a)gmail.com> date: Fri Nov 01 12:05:37 2013 +0100 summary: PEP 454 * rename disable/enable/is_enabled() to stop/start/is_tracing() * add disable/enable/is_enabled() which are temporary, and disable() doesn't clear traces * a traceback now always contains a least 1 frame, use (('<unknown>', 0),) if the traceback cannot read or if the traceback limit is 0 * write more documentation on filter functions files: pep-0454.txt | 87 ++++++++++++++++++++++++++++++++++----- 1 files changed, 75 insertions(+), 12 deletions(-) diff --git a/pep-0454.txt b/pep-0454.txt --- a/pep-0454.txt +++ b/pep-0454.txt @@ -117,20 +117,23 @@ ``disable()`` function: - Stop tracing Python memory allocations and clear traces of memory - blocks allocated by Python. + Disable temporarily tracing new Python memory allocations, + deallocations are still traced. The change is process-wide, tracing + new Python memory allocations is disabled in all threads. Call + ``enable()`` to reenable tracing new Python memory allocations. - Call ``get_traces()`` or ``take_snapshot()`` function to get traces - before clearing them. + Filters can be used to not trace memory allocations in some files: + use the ``add_filter()`` function. See also ``enable()`` and ``is_enabled()`` functions. ``enable()`` function: - Start tracing Python memory allocations. + Reenable tracing Python memory allocations if was disabled by te + ``disable()`` method. - See also ``disable()`` and ``is_enabled()`` functions. + See also ``is_enabled()`` functions. ``get_traced_memory()`` function: @@ -147,10 +150,50 @@ ``is_enabled()`` function: + ``True`` if the ``tracemalloc`` module is enabled Python memory + allocations, ``False`` if the module is disabled. + + The ``tracemalloc`` module only traces new allocations if + ``is_tracing()`` and ``is_enabled()`` are ``True``. + + See also ``enable()`` and ``disable()`` functions. + + +``is_tracing()`` function: + ``True`` if the ``tracemalloc`` module is tracing Python memory allocations, ``False`` otherwise. - See also ``disable()`` and ``enable()`` functions. + The ``tracemalloc`` module only traces new allocations if + ``is_tracing()`` and ``is_enabled()`` are ``True``. + + See also ``start()`` and ``stop()`` functions. + + +``stop()`` function: + + Stop tracing Python memory allocations and clear traces of memory + blocks allocated by Python. + + The function uninstalls hooks on Python memory allocators, so the + overhead of the module becomes null. + + Call ``get_traces()`` or ``take_snapshot()`` function to get traces + before clearing them. Use ``disable()`` to disable tracing + temporarily. + + See also ``enable()`` and ``is_enabled()`` functions. + + +``start()`` function: + + Start tracing Python memory allocations. + + The function installs hooks on Python memory allocators. These hooks + have important overhead in term of performances and memory usage: + see `Filter functions`_ to limit the overhead. + + See also ``disable()`` and ``is_tracing()`` functions. ``take_snapshot()`` function: @@ -177,8 +220,10 @@ frame, limited to ``get_traceback_limit()`` frames. A frame is a ``(filename: str, lineno: int)`` tuple. -If ``tracemalloc`` failed to get the whole traceback, the traceback may be -empty, truncated or contain ``"<unknown>"`` filename and line number 0. +A traceback contains at least ``1`` frame. If the ``tracemalloc`` module +failed to get a frame, the ``"<unknown>"`` filename and the line number ``0`` +are used. If it failed to get the traceback or if the traceback limit is ``0``, +the traceback is ``(('<unknown>', 0),)``. Example of a trace: ``(32, (('x.py', 7), ('x.py', 11)))``. The memory block has a size of 32 bytes and was allocated at ``x.py:7``, line called from line @@ -238,6 +283,9 @@ function to measure the overhead and the ``add_filter()`` function to select which memory allocations are traced. + If the limit is set to ``0`` frame, the traceback ``(('<unknown>', + 0),)`` will be used for all traces. + Use the ``get_traceback_limit()`` function to get the current limit. The ``PYTHONTRACEMALLOC`` environment variable and the ``-X`` @@ -248,6 +296,24 @@ Filter functions ---------------- +Tracing all Python memroy allocations has an important overhead on performances +and on the memory usage. + +To limit the overhead, some files can be excluded or tracing can be restricted +to a set of files using filters. Examples: ``add_filter(Filter(True, +subprocess.__file__))`` only traces memory allocations in the ``subprocess`` +module, and ``add_filter(Filter(False, tracemalloc.__file__))`` do not trace +memory allocations in the ``tracemalloc`` module + +By default, there is one exclusive filter to ignore Python memory blocks +allocated by the ``tracemalloc`` module. + +Tracing can be also be disabled temporarily using the ``disable()`` function. + +Use the ``get_tracemalloc_memory()`` function to measure the memory usage. +See also the ``set_traceback_limit()`` function to configure how many +frames are stored. + ``add_filter(filter)`` function: Add a new filter on Python memory allocations, *filter* is a @@ -274,9 +340,6 @@ Get the filters on Python memory allocations. Return a list of ``Filter`` instances. - By default, there is one exclusive filter to ignore Python memory - blocks allocated by the ``tracemalloc`` module. - See also the ``clear_filters()`` function. -- Repository URL: http://hg.python.org/peps

1 0

Daily reference leaks (13a05ed33cf7): sum=0
by solipsis＠pitrou.net Nov. 1, 2013

Nov. 1, 2013

results for 13a05ed33cf7 on branch "default" -------------------------------------------- test_site leaked [0, -2, 2] references, sum=0 test_site leaked [0, -2, 2] memory blocks, sum=0 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogFwlbI4', '-x']

1 0

cpython: Issue #19413: Disregard duplicate namespace portions during reload tests.
by eric.snow Nov. 1, 2013

Nov. 1, 2013

http://hg.python.org/cpython/rev/78d36d54391c changeset: 86820:78d36d54391c user: Eric Snow <ericsnowcurrently(a)gmail.com> date: Thu Oct 31 23:44:31 2013 -0600 summary: Issue #19413: Disregard duplicate namespace portions during reload tests. files: Lib/test/test_importlib/test_api.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_importlib/test_api.py b/Lib/test/test_importlib/test_api.py --- a/Lib/test/test_importlib/test_api.py +++ b/Lib/test/test_importlib/test_api.py @@ -279,8 +279,8 @@ del ns['__initializing__'] loader = ns.pop('__loader__') path = ns.pop('__path__') - self.assertEqual(list(path), - [os.path.dirname(bad_path)] * 2) + self.assertEqual(set(path), + set([os.path.dirname(bad_path)])) with self.assertRaises(AttributeError): # a NamespaceLoader loader.path -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #19413: Restore pre-3.3 reload() semantics of re-finding modules.
by eric.snow Nov. 1, 2013

Nov. 1, 2013

http://hg.python.org/cpython/rev/88c3a1a3c2ff changeset: 86819:88c3a1a3c2ff parent: 86816:13a05ed33cf7 user: Eric Snow <ericsnowcurrently(a)gmail.com> date: Thu Oct 31 22:22:15 2013 -0600 summary: Issue #19413: Restore pre-3.3 reload() semantics of re-finding modules. files: Lib/importlib/__init__.py | 8 +- Lib/importlib/_bootstrap.py | 8 +- Lib/test/test_importlib/test_api.py | 120 + Misc/NEWS | 2 + Python/importlib.h | 1011 +++++++------- 5 files changed, 642 insertions(+), 507 deletions(-) diff --git a/Lib/importlib/__init__.py b/Lib/importlib/__init__.py --- a/Lib/importlib/__init__.py +++ b/Lib/importlib/__init__.py @@ -107,7 +107,7 @@ if not module or not isinstance(module, types.ModuleType): raise TypeError("reload() argument must be module") name = module.__name__ - if name not in sys.modules: + if sys.modules.get(name) is not module: msg = "module {} not in sys.modules" raise ImportError(msg.format(name), name=name) if name in _RELOADING: @@ -118,7 +118,11 @@ if parent_name and parent_name not in sys.modules: msg = "parent {!r} not in sys.modules" raise ImportError(msg.format(parent_name), name=parent_name) - module.__loader__.load_module(name) + loader = _bootstrap._find_module(name, None) + if loader is None: + raise ImportError(_bootstrap._ERR_MSG.format(name), name=name) + module.__loader__ = loader + loader.load_module(name) # The module may have replaced itself in sys.modules! return sys.modules[module.__name__] finally: diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1510,15 +1510,19 @@ """Find a module's loader.""" if not sys.meta_path: _warnings.warn('sys.meta_path is empty', ImportWarning) + is_reload = name in sys.modules for finder in sys.meta_path: with _ImportLockContext(): loader = finder.find_module(name, path) if loader is not None: # The parent import may have already imported this module. - if name not in sys.modules: + if is_reload or name not in sys.modules: return loader else: - return sys.modules[name].__loader__ + try: + return sys.modules[name].__loader__ + except AttributeError: + return loader else: return None diff --git a/Lib/test/test_importlib/test_api.py b/Lib/test/test_importlib/test_api.py --- a/Lib/test/test_importlib/test_api.py +++ b/Lib/test/test_importlib/test_api.py @@ -1,8 +1,10 @@ from . import util frozen_init, source_init = util.import_importlib('importlib') +frozen_util, source_util = util.import_importlib('importlib.util') frozen_machinery, source_machinery = util.import_importlib('importlib.machinery') +import os.path import sys from test import support import types @@ -190,11 +192,129 @@ self.assertEqual(actual.spam, 3) self.assertEqual(reloaded.spam, 3) + def test_reload_missing_loader(self): + with support.CleanImport('types'): + import types + loader = types.__loader__ + del types.__loader__ + reloaded = self.init.reload(types) + + self.assertIs(reloaded, types) + self.assertIs(sys.modules['types'], types) + self.assertEqual(reloaded.__loader__.path, loader.path) + + def test_reload_loader_replaced(self): + with support.CleanImport('types'): + import types + types.__loader__ = None + self.init.invalidate_caches() + reloaded = self.init.reload(types) + + self.assertIsNot(reloaded.__loader__, None) + self.assertIs(reloaded, types) + self.assertIs(sys.modules['types'], types) + + def test_reload_location_changed(self): + name = 'spam' + with support.temp_cwd(None) as cwd: + with util.uncache('spam'): + with support.DirsOnSysPath(cwd): + self.init.invalidate_caches() + path = os.path.join(cwd, name + '.py') + cached = self.util.cache_from_source(path) + expected = {'__name__': name, + '__package__': '', + '__file__': path, + '__cached__': cached, + '__doc__': None, + '__builtins__': __builtins__, + } + support.create_empty_file(path) + module = self.init.import_module(name) + ns = vars(module) + del ns['__initializing__'] + loader = ns.pop('__loader__') + self.assertEqual(loader.path, path) + self.assertEqual(ns, expected) + + self.init.invalidate_caches() + init_path = os.path.join(cwd, name, '__init__.py') + cached = self.util.cache_from_source(init_path) + expected = {'__name__': name, + '__package__': name, + '__file__': init_path, + '__cached__': cached, + '__path__': [os.path.dirname(init_path)], + '__doc__': None, + '__builtins__': __builtins__, + } + os.mkdir(name) + os.rename(path, init_path) + reloaded = self.init.reload(module) + ns = vars(reloaded) + del ns['__initializing__'] + loader = ns.pop('__loader__') + self.assertIs(reloaded, module) + self.assertEqual(loader.path, init_path) + self.assertEqual(ns, expected) + + def test_reload_namespace_changed(self): + self.maxDiff = None + name = 'spam' + with support.temp_cwd(None) as cwd: + with util.uncache('spam'): + with support.DirsOnSysPath(cwd): + self.init.invalidate_caches() + bad_path = os.path.join(cwd, name, '__init.py') + cached = self.util.cache_from_source(bad_path) + expected = {'__name__': name, + '__package__': name, + '__doc__': None, + } + os.mkdir(name) + with open(bad_path, 'w') as init_file: + init_file.write('eggs = None') + module = self.init.import_module(name) + ns = vars(module) + del ns['__initializing__'] + loader = ns.pop('__loader__') + path = ns.pop('__path__') + self.assertEqual(list(path), + [os.path.dirname(bad_path)] * 2) + with self.assertRaises(AttributeError): + # a NamespaceLoader + loader.path + self.assertEqual(ns, expected) + + self.init.invalidate_caches() + init_path = os.path.join(cwd, name, '__init__.py') + cached = self.util.cache_from_source(init_path) + expected = {'__name__': name, + '__package__': name, + '__file__': init_path, + '__cached__': cached, + '__path__': [os.path.dirname(init_path)], + '__doc__': None, + '__builtins__': __builtins__, + 'eggs': None, + } + os.rename(bad_path, init_path) + reloaded = self.init.reload(module) + ns = vars(reloaded) + del ns['__initializing__'] + loader = ns.pop('__loader__') + self.assertIs(reloaded, module) + self.assertEqual(loader.path, init_path) + self.assertEqual(ns, expected) + + class Frozen_ReloadTests(ReloadTests, unittest.TestCase): init = frozen_init + util = frozen_util class Source_ReloadTests(ReloadTests, unittest.TestCase): init = source_init + util = source_util class InvalidateCacheTests: diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -127,6 +127,8 @@ - Issue #8964: fix platform._sys_version to handle IronPython 2.6+. Patch by Martin Matusiak. +- Issue #19413: Restore pre-3.3 reload() semantics of re-finding modules. + - Issue #18958: Improve error message for json.load(s) while passing a string that starts with a UTF-8 BOM. diff --git a/Python/importlib.h b/Python/importlib.h --- a/Python/importlib.h +++ b/Python/importlib.h [stripped] -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 2.7 -> 2.7): merge 2.7.6 release branch
by benjamin.peterson Nov. 1, 2013

Nov. 1, 2013

http://hg.python.org/cpython/rev/01087a302721 changeset: 86818:01087a302721 branch: 2.7 parent: 86800:8d5df9602a72 parent: 86817:2d02b7a97e0b user: Benjamin Peterson <benjamin(a)python.org> date: Thu Oct 31 20:23:57 2013 -0400 summary: merge 2.7.6 release branch files: Misc/NEWS | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -15,26 +15,29 @@ Tests ----- + +Whats' New in Python 2.7.6? +=========================== + +*Release date: 2013-11-02* + +Library +------- + +- Issue #19435: Fix directory traversal attack on CGIHttpRequestHandler. + +IDLE +---- + +- Issue #19426: Fixed the opening of Python source file with specified encoding. + +Tests +----- + - Issue #19457: Fixed xmlcharrefreplace tests on wide build when tests are loaded from .py[co] files. -Whats' New in Python 2.7.6? -=========================== - -*Release date: 2013-11-02* - -Library -------- - -- Issue #19435: Fix directory traversal attack on CGIHttpRequestHandler. - -IDLE ----- - -- Issue #19426: Fixed the opening of Python source file with specified encoding. - - What's New in Python 2.7.6 release candidate 1? =============================================== -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): fix xmlcharrefreplace tests on wide build when tests are loaded from .py[co]
by benjamin.peterson Nov. 1, 2013

Nov. 1, 2013

http://hg.python.org/cpython/rev/2d02b7a97e0b changeset: 86817:2d02b7a97e0b branch: 2.7 parent: 86775:e4fe8fcaef0d user: Benjamin Peterson <benjamin(a)python.org> date: Thu Oct 31 20:22:41 2013 -0400 summary: fix xmlcharrefreplace tests on wide build when tests are loaded from .py[co] files. files: Lib/test/test_codeccallbacks.py | 4 ++-- Lib/test/test_unicode.py | 4 ++-- Misc/NEWS | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_codeccallbacks.py b/Lib/test/test_codeccallbacks.py --- a/Lib/test/test_codeccallbacks.py +++ b/Lib/test/test_codeccallbacks.py @@ -84,9 +84,9 @@ tests = [(u'\U0001f49d', '💝'), (u'\ud83d', '&#55357;'), (u'\udc9d', '&#56477;'), - (u'\ud83d\udc9d', '💝' if len(u'\U0001f49d') > 1 else - '&#55357;&#56477;'), ] + if u'\ud83d\udc9d' != u'\U0001f49d': + tests += [(u'\ud83d\udc9d', '&#55357;&#56477;')] for encoding in ['ascii', 'latin1', 'iso-8859-15']: for s, exp in tests: self.assertEqual(s.encode(encoding, 'xmlcharrefreplace'), diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -1663,9 +1663,9 @@ tests = [(u'\U0001f49d', '💝'), (u'\ud83d', '&#55357;'), (u'\udc9d', '&#56477;'), - (u'\ud83d\udc9d', '💝' if len(u'\U0001f49d') > 1 else - '&#55357;&#56477;'), ] + if u'\ud83d\udc9d' != u'\U0001f49d': + tests += [(u'\ud83d\udc9d', '&#55357;&#56477;')] for s, exp in tests: self.assertEqual( unicode_encodedecimal(u"123" + s, "xmlcharrefreplace"), diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,12 @@ - Issue #19426: Fixed the opening of Python source file with specified encoding. +Tests +----- + +- Issue #19457: Fixed xmlcharrefreplace tests on wide build when tests are + loaded from .py[co] files. + What's New in Python 2.7.6 release candidate 1? =============================================== -- Repository URL: http://hg.python.org/cpython

1 0