Mailman 3 May 2013 - Python-checkins

r88999 - sandbox/trunk/setuptools/setuptools/ssl_support.py
by phillip.eby May 31, 2013

May 31, 2013

Author: phillip.eby Date: Fri May 31 21:32:43 2013 New Revision: 88999 Log: Fix missing import Modified: sandbox/trunk/setuptools/setuptools/ssl_support.py Modified: sandbox/trunk/setuptools/setuptools/ssl_support.py ============================================================================== --- sandbox/trunk/setuptools/setuptools/ssl_support.py (original) +++ sandbox/trunk/setuptools/setuptools/ssl_support.py Fri May 31 21:32:43 2013 @@ -1,5 +1,5 @@ -import sys, os, socket, urllib2, atexit, re -from pkg_resources import ResolutionError, ExtractionError +import sys, os, socket, urllib2, atexit +from pkg_resources import ResolutionError, ExtractionError, resource_filename try: import ssl @@ -236,7 +236,7 @@ if os.path.isfile(cert_path): return cert_path try: - return pkg_resources.resource_filename('certifi', 'cacert.pem') + return resource_filename('certifi', 'cacert.pem') except (ImportError, ResolutionError, ExtractionError): return None

1 0

r88998 - sandbox/branches/setuptools-0.6/setuptools/ssl_support.py
by phillip.eby May 31, 2013

May 31, 2013

Author: phillip.eby Date: Fri May 31 21:32:27 2013 New Revision: 88998 Log: Fix missing import Modified: sandbox/branches/setuptools-0.6/setuptools/ssl_support.py Modified: sandbox/branches/setuptools-0.6/setuptools/ssl_support.py ============================================================================== --- sandbox/branches/setuptools-0.6/setuptools/ssl_support.py (original) +++ sandbox/branches/setuptools-0.6/setuptools/ssl_support.py Fri May 31 21:32:27 2013 @@ -1,5 +1,5 @@ -import sys, os, socket, urllib2, atexit, re -from pkg_resources import ResolutionError, ExtractionError +import sys, os, socket, urllib2, atexit +from pkg_resources import ResolutionError, ExtractionError, resource_filename try: import ssl @@ -236,7 +236,7 @@ if os.path.isfile(cert_path): return cert_path try: - return pkg_resources.resource_filename('certifi', 'cacert.pem') + return resource_filename('certifi', 'cacert.pem') except (ImportError, ResolutionError, ExtractionError): return None

1 0

peps: Explicitly state that the default implementation is registered for `object`
by lukasz.langa May 31, 2013

May 31, 2013

http://hg.python.org/peps/rev/4d6c827944c4 changeset: 4920:4d6c827944c4 user: Łukasz Langa <lukasz(a)langa.pl> date: Fri May 31 12:31:11 2013 +0200 summary: Explicitly state that the default implementation is registered for `object` Thanks to Gustavo Carneiro for the suggestion. files: pep-0443.txt | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pep-0443.txt b/pep-0443.txt --- a/pep-0443.txt +++ b/pep-0443.txt @@ -134,13 +134,17 @@ Where there is no registered implementation for a specific type, its method resolution order is used to find a more generic implementation. +The original function decorated with ``@singledispatch`` is registered +for the base ``object`` type, which means it is used if no better +implementation is found. + To check which implementation will the generic function choose for a given type, use the ``dispatch()`` attribute:: >>> fun.dispatch(float) <function fun_num at 0x104319058> - >>> fun.dispatch(dict) - <function fun at 0x103fe4788> + >>> fun.dispatch(dict) # note: default implementation + <function fun at 0x103fe0000> To access all registered implementations, use the read-only ``registry`` attribute:: @@ -152,7 +156,7 @@ >>> fun.registry[float] <function fun_num at 0x1035a2840> >>> fun.registry[object] - <function fun at 0x103170788> + <function fun at 0x103fe0000> The proposed API is intentionally limited and opinionated, as to ensure it is easy to explain and use, as well as to maintain consistency with -- Repository URL: http://hg.python.org/peps

1 0

peps: reference the final posting on python-dev
by lukasz.langa May 31, 2013

May 31, 2013

http://hg.python.org/peps/rev/92816a630302 changeset: 4919:92816a630302 user: Łukasz Langa <lukasz(a)langa.pl> date: Fri May 31 11:34:10 2013 +0200 summary: reference the final posting on python-dev files: pep-0443.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0443.txt b/pep-0443.txt --- a/pep-0443.txt +++ b/pep-0443.txt @@ -8,7 +8,7 @@ Type: Standards Track Content-Type: text/x-rst Created: 22-May-2013 -Post-History: 22-May-2013, 25-May-2013 +Post-History: 22-May-2013, 25-May-2013, 31-May-2013 Replaces: 245, 246, 3124 -- Repository URL: http://hg.python.org/peps

1 0

Daily reference leaks (0ebc9005cb00): sum=2
by solipsis＠pitrou.net May 31, 2013

May 31, 2013

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

1 0

cpython: Remove duplicate entry due to mismerge and incomplete resolution.
by terry.reedy May 31, 2013

May 31, 2013

http://hg.python.org/cpython/rev/0ebc9005cb00 changeset: 83992:0ebc9005cb00 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu May 30 21:08:49 2013 -0400 summary: Remove duplicate entry due to mismerge and incomplete resolution. files: Misc/NEWS | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -320,9 +320,6 @@ Tests ----- -- Issue #15392: Create a unittest framework for IDLE. - Rajagopalasarma Jayakrishnan - - Issue #17992: Add timeouts to asyncore and asynchat tests so that they won't accidentally hang. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): merge
by terry.reedy May 31, 2013

May 31, 2013

http://hg.python.org/cpython/rev/26cf22140cca changeset: 83991:26cf22140cca parent: 83988:6ace4133c1c0 parent: 83990:16fea8b0f8c4 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu May 30 21:05:53 2013 -0400 summary: merge files: Misc/NEWS | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -402,6 +402,9 @@ IDLE ---- +- Issue #15392: Create a unittest framework for IDLE. + Initial patch by Rajagopalasarma Jayakrishnan. + - Issue #14146: Highlight source line while debugging on Windows. - Issue #17838: Allow sys.stdin to be reassigned. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #15392: Finish news entry.
by terry.reedy May 31, 2013

May 31, 2013

http://hg.python.org/cpython/rev/16fea8b0f8c4 changeset: 83990:16fea8b0f8c4 branch: 3.3 parent: 83981:280303da5b30 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu May 30 20:55:52 2013 -0400 summary: Issue #15392: Finish news entry. files: Misc/NEWS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -68,7 +68,7 @@ ---- - Issue #15392: Create a unittest framework for IDLE. - Rajagopalasarma Jayakrishnan + Initial patch by Rajagopalasarma Jayakrishnan. - Issue #14146: Highlight source line while debugging on Windows. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #15392: Use test.test_support, as used test.support in 3.x.
by terry.reedy May 30, 2013

May 30, 2013

http://hg.python.org/cpython/rev/6159916c712e changeset: 83989:6159916c712e branch: 2.7 parent: 83986:93eb15779050 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Thu May 30 18:24:28 2013 -0400 summary: Issue #15392: Use test.test_support, as used test.support in 3.x. files: Lib/test/test_idle.py | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_idle.py b/Lib/test/test_idle.py --- a/Lib/test/test_idle.py +++ b/Lib/test/test_idle.py @@ -1,11 +1,8 @@ # Skip test if _tkinter or _thread wasn't built or idlelib was deleted. -try: - import Tkinter - import threading # imported by PyShell, imports _thread - import idlelib.idle_test as idletest -except ImportError: - import unittest - raise unittest.SkipTest +from test.test_support import import_module +import_module('Tkinter') +import_module('threading') # imported by PyShell, imports _thread +idletest = import_module('idlelib.idle_test') # Without test_main present, regrtest.runtest_inner (line1219) calls # unittest.TestLoader().loadTestsFromModule(this_module) which calls -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Rename importlib.util.ModuleManager to module_to_load so that the name
by brett.cannon May 30, 2013

May 30, 2013

http://hg.python.org/cpython/rev/6ace4133c1c0 changeset: 83988:6ace4133c1c0 user: Brett Cannon <brett(a)python.org> date: Thu May 30 17:31:47 2013 -0400 summary: Rename importlib.util.ModuleManager to module_to_load so that the name explains better what the context manager is providing. files: Doc/library/importlib.rst | 13 +- Lib/importlib/_bootstrap.py | 11 +- Lib/importlib/util.py | 2 +- Lib/test/test_importlib/test_util.py | 14 +- Misc/NEWS | 4 +- Python/importlib.h | 7035 +++++++------ 6 files changed, 3550 insertions(+), 3529 deletions(-) diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst @@ -789,12 +789,13 @@ .. versionadded:: 3.3 -.. class:: ModuleManager(name) +.. function:: module_to_load(name) - A :term:`context manager` which provides the module to load. The module will - either come from :attr:`sys.modules` in the case of reloading or a fresh - module if loading a new module. Proper cleanup of :attr:`sys.modules` occurs - if the module was new and an exception was raised. + Returns a :term:`context manager` which provides the module to load. The + module will either come from :attr:`sys.modules` in the case of reloading or + a fresh module if loading a new module. Proper cleanup of + :attr:`sys.modules` occurs if the module was new and an exception was + raised. .. versionadded:: 3.4 @@ -823,7 +824,7 @@ in :data:`sys.modules` then it is left alone. .. note:: - :class:`ModuleManager` subsumes the module management aspect of this + :func:`module_to_load` subsumes the module management aspect of this decorator. .. versionchanged:: 3.3 diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -484,7 +484,8 @@ print(message.format(*args), file=sys.stderr) -class ModuleManager: +# Written as a class only because contextlib is not available. +class _ModuleManager: """Context manager which returns the module to be loaded. @@ -516,6 +517,12 @@ del sys.modules[self._name] +def module_to_load(name): + """Return a context manager which provides the module object to load.""" + # Hiding _ModuleManager behind a function for better naming. + return _ModuleManager(name) + + def set_package(fxn): """Set __package__ on the returned module.""" def set_package_wrapper(*args, **kwargs): @@ -559,7 +566,7 @@ """ def module_for_loader_wrapper(self, fullname, *args, **kwargs): - with ModuleManager(fullname) as module: + with module_to_load(fullname) as module: module.__loader__ = self try: is_package = self.is_package(fullname) diff --git a/Lib/importlib/util.py b/Lib/importlib/util.py --- a/Lib/importlib/util.py +++ b/Lib/importlib/util.py @@ -1,6 +1,6 @@ """Utility code for constructing importers, etc.""" -from ._bootstrap import ModuleManager +from ._bootstrap import module_to_load from ._bootstrap import module_for_loader from ._bootstrap import set_loader from ._bootstrap import set_package diff --git a/Lib/test/test_importlib/test_util.py b/Lib/test/test_importlib/test_util.py --- a/Lib/test/test_importlib/test_util.py +++ b/Lib/test/test_importlib/test_util.py @@ -7,7 +7,7 @@ import unittest -class ModuleManagerTests(unittest.TestCase): +class ModuleToLoadTests(unittest.TestCase): module_name = 'ModuleManagerTest_module' @@ -19,7 +19,7 @@ # Test a new module is created, inserted into sys.modules, has # __initializing__ set to True after entering the context manager, # and __initializing__ set to False after exiting. - with util.ModuleManager(self.module_name) as module: + with util.module_to_load(self.module_name) as module: self.assertIn(self.module_name, sys.modules) self.assertIs(sys.modules[self.module_name], module) self.assertTrue(module.__initializing__) @@ -28,19 +28,19 @@ def test_new_module_failed(self): # Test the module is removed from sys.modules. try: - with util.ModuleManager(self.module_name) as module: + with util.module_to_load(self.module_name) as module: self.assertIn(self.module_name, sys.modules) raise exception except Exception: self.assertNotIn(self.module_name, sys.modules) else: - self.fail('importlib.util.ModuleManager swallowed an exception') + self.fail('importlib.util.module_to_load swallowed an exception') def test_reload(self): # Test that the same module is in sys.modules. created_module = imp.new_module(self.module_name) sys.modules[self.module_name] = created_module - with util.ModuleManager(self.module_name) as module: + with util.module_to_load(self.module_name) as module: self.assertIs(module, created_module) def test_reload_failed(self): @@ -48,12 +48,12 @@ created_module = imp.new_module(self.module_name) sys.modules[self.module_name] = created_module try: - with util.ModuleManager(self.module_name) as module: + with util.module_to_load(self.module_name) as module: raise Exception except Exception: self.assertIn(self.module_name, sys.modules) else: - self.fail('importlib.util.ModuleManager swallowed an exception') + self.fail('importlib.util.module_to_load swallowed an exception') class ModuleForLoaderTests(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -103,8 +103,8 @@ - Issue #18070: Have importlib.util.module_for_loader() set attributes unconditionally in order to properly support reloading. -- Add importlib.util.ModuleManager as a context manager to provide the proper - module object to load. +- Add importlib.util.module_to_load to return a context manager to provide the + proper module object to load. - Issue #18025: Fixed a segfault in io.BufferedIOBase.readinto() when raw stream's read() returns more bytes than requested. 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