Mailman 3 February 2012 - Python-checkins

cpython (merge 3.2 -> default): Merged cookbook improvement from 3.2.
by vinay.sajip Feb. 28, 2012

Feb. 28, 2012

http://hg.python.org/cpython/rev/3328e388cb28 changeset: 75328:3328e388cb28 parent: 75326:49ed56671274 parent: 75327:514d602c3db5 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Tue Feb 28 08:06:01 2012 +0000 summary: Merged cookbook improvement from 3.2. files: Doc/howto/logging-cookbook.rst | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -972,12 +972,13 @@ When logging was added to the Python standard library, the only way of formatting messages with variable content was to use the %-formatting method. Since then, Python has gained two new formatting approaches: -string.Template (added in Python 2.4) and str.format (added in Python 2.6). +:class:`string.Template` (added in Python 2.4) and :meth:`str.format` +(added in Python 2.6). -Logging now (as of 3.2) provides improved support for these two additional -formatting styles. The :class:`Formatter` class been enhanced for Python 3.2 to -take an additional, optional keyword parameter named ``style``. This defaults -to ``'%'``, but other possible values are ``'{'`` and ``'$'``, which correspond +Logging (as of 3.2) provides improved support for these two additional +formatting styles. The :class:`Formatter` class been enhanced to take an +additional, optional keyword parameter named ``style``. This defaults to +``'%'``, but other possible values are ``'{'`` and ``'$'``, which correspond to the other two formatting styles. Backwards compatibility is maintained by default (as you would expect), but by explicitly specifying a style parameter, you get the ability to specify format strings which work with @@ -1068,7 +1069,7 @@ .. code-block:: pycon >>> from wherever import BraceMessage as __ - >>> print(__('Message with {0} {1}', 2, 'placeholders')) + >>> print(__('Message with {0} {name}', 2, name='placeholders')) Message with 2 placeholders >>> class Point: pass ... @@ -1083,6 +1084,10 @@ Message with 2 placeholders >>> +While the above examples use ``print()`` to show how the formatting works, you +would of course use ``logger.debug()`` or similar to actually log using this +approach. + One thing to note is that you pay no significant performance penalty with this approach: the actual formatting happens not when you make the logging call, but when (and if) the logged message is actually about to be output to a log by a -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Improved logging cookbook example.
by vinay.sajip Feb. 28, 2012

Feb. 28, 2012

http://hg.python.org/cpython/rev/514d602c3db5 changeset: 75327:514d602c3db5 branch: 3.2 parent: 75325:e656738cb631 user: Vinay Sajip <vinay_sajip(a)yahoo.co.uk> date: Tue Feb 28 08:05:23 2012 +0000 summary: Improved logging cookbook example. files: Doc/howto/logging-cookbook.rst | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -972,12 +972,13 @@ When logging was added to the Python standard library, the only way of formatting messages with variable content was to use the %-formatting method. Since then, Python has gained two new formatting approaches: -string.Template (added in Python 2.4) and str.format (added in Python 2.6). +:class:`string.Template` (added in Python 2.4) and :meth:`str.format` +(added in Python 2.6). -Logging now (as of 3.2) provides improved support for these two additional -formatting styles. The :class:`Formatter` class been enhanced for Python 3.2 to -take an additional, optional keyword parameter named ``style``. This defaults -to ``'%'``, but other possible values are ``'{'`` and ``'$'``, which correspond +Logging (as of 3.2) provides improved support for these two additional +formatting styles. The :class:`Formatter` class been enhanced to take an +additional, optional keyword parameter named ``style``. This defaults to +``'%'``, but other possible values are ``'{'`` and ``'$'``, which correspond to the other two formatting styles. Backwards compatibility is maintained by default (as you would expect), but by explicitly specifying a style parameter, you get the ability to specify format strings which work with @@ -1068,7 +1069,7 @@ .. code-block:: pycon >>> from wherever import BraceMessage as __ - >>> print(__('Message with {0} {1}', 2, 'placeholders')) + >>> print(__('Message with {0} {name}', 2, name='placeholders')) Message with 2 placeholders >>> class Point: pass ... @@ -1083,6 +1084,10 @@ Message with 2 placeholders >>> +While the above examples use ``print()`` to show how the formatting works, you +would of course use ``logger.debug()`` or similar to actually log using this +approach. + One thing to note is that you pay no significant performance penalty with this approach: the actual formatting happens not when you make the logging call, but when (and if) the logged message is actually about to be output to a log by a -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge with 3.2.
by georg.brandl Feb. 28, 2012

Feb. 28, 2012

http://hg.python.org/cpython/rev/49ed56671274 changeset: 75326:49ed56671274 parent: 75324:de125ee32897 parent: 75325:e656738cb631 user: Georg Brandl <georg(a)python.org> date: Tue Feb 28 08:21:49 2012 +0100 summary: Merge with 3.2. files: Doc/howto/logging-cookbook.rst | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -1094,7 +1094,7 @@ .. currentmodule:: logging -.. custom-logrecord: +.. _custom-logrecord: Customising ``LogRecord`` ------------------------- @@ -1134,9 +1134,7 @@ you to e.g. use a specialized subclass of :class:`LogRecord`. Library developers can set a suitable filter on their loggers, but they would have to remember to do this every time they introduced a new logger (which they would -do simply by adding new packages or modules and doing - -.. code-block:: python +do simply by adding new packages or modules and doing :: logger = logging.getLogger(__name__) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Fix markup errors.
by georg.brandl Feb. 28, 2012

Feb. 28, 2012

http://hg.python.org/cpython/rev/e656738cb631 changeset: 75325:e656738cb631 branch: 3.2 parent: 75320:2fd68efac05a user: Georg Brandl <georg(a)python.org> date: Tue Feb 28 08:21:40 2012 +0100 summary: Fix markup errors. files: Doc/howto/logging-cookbook.rst | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst --- a/Doc/howto/logging-cookbook.rst +++ b/Doc/howto/logging-cookbook.rst @@ -1094,7 +1094,7 @@ .. currentmodule:: logging -.. custom-logrecord: +.. _custom-logrecord: Customising ``LogRecord`` ------------------------- @@ -1134,9 +1134,7 @@ you to e.g. use a specialized subclass of :class:`LogRecord`. Library developers can set a suitable filter on their loggers, but they would have to remember to do this every time they introduced a new logger (which they would -do simply by adding new packages or modules and doing - -.. code-block:: python +do simply by adding new packages or modules and doing :: logger = logging.getLogger(__name__) -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (de125ee32897): sum=0
by solipsis＠pitrou.net Feb. 28, 2012

Feb. 28, 2012

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

1 0

peps: I understand what Nick meant now
by benjamin.peterson Feb. 27, 2012

Feb. 27, 2012

http://hg.python.org/peps/rev/38cd1efd3148 changeset: 4091:38cd1efd3148 user: Benjamin Peterson <benjamin(a)python.org> date: Mon Feb 27 18:59:27 2012 -0500 summary: I understand what Nick meant now files: pep-0415.txt | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/pep-0415.txt b/pep-0415.txt --- a/pep-0415.txt +++ b/pep-0415.txt @@ -41,11 +41,12 @@ Proposal ======== -A new attribute on ``BaseException``, ``__suppress_context__``, will be -introduced. The ``raise exc from None`` syntax will cause -``exc.__suppress_context__`` to be set to ``True``. Exception printing code will -check for the attribute to determine whether context and cause will be -printed. ``__cause__`` will return to its original purpose and values. +A new attribute on ``BaseException``, ``__suppress_context__``, will +be introduced. The ``raise exc from cause`` syntax will set +``exc.__suppress_context__`` to ``True``. Exception printing code will +check for that attribute to determine whether context and cause will +be printed. ``__cause__`` will return to its original purpose and +values. There is precedence for ``__suppress_context__`` with the ``print_line_and_file`` exception attribute. @@ -53,7 +54,7 @@ To summarize, ``raise exc from cause`` will be equivalent to:: exc.__cause__ = cause - exc.__suppress_context__ = cause is None + exc.__suppress_context__ = True raise exc Patches -- Repository URL: http://hg.python.org/peps

1 0

cpython: Update importlib.invalidate_caches() to be more general.
by brett.cannon Feb. 27, 2012

Feb. 27, 2012

http://hg.python.org/cpython/rev/de125ee32897 changeset: 75324:de125ee32897 user: Brett Cannon <brett(a)python.org> date: Mon Feb 27 18:15:42 2012 -0500 summary: Update importlib.invalidate_caches() to be more general. files: Doc/library/importlib.rst | 15 ++++- Lib/importlib/__init__.py | 31 +++-------- Lib/importlib/_bootstrap.py | 19 +----- Lib/importlib/test/source/test_finder.py | 7 ++ Lib/importlib/test/test_api.py | 28 ++++++++++ 5 files changed, 62 insertions(+), 38 deletions(-) diff --git a/Doc/library/importlib.rst b/Doc/library/importlib.rst --- a/Doc/library/importlib.rst +++ b/Doc/library/importlib.rst @@ -88,9 +88,12 @@ .. function:: invalidate_caches() - Invalidate importlib's internal caches. Calling this function may be - needed if some modules are installed while your program is running and - you expect the program to notice the changes. + Invalidate the internal caches of the finders stored at + :data:`sys.path_importer_cache`. If a finder implements + :meth:`abc.Finder.invalidate_caches()` then it will be called to perform the + invalidation. This function may be needed if some modules are installed + while your program is running and you expect the program to notice the + changes. .. versionadded:: 3.3 @@ -119,6 +122,12 @@ be the value of :attr:`__path__` from the parent package. If a loader cannot be found, ``None`` is returned. + .. method:: invalidate_caches() + + An optional method which, when called, should invalidate any internal + cache used by the finder. Used by :func:`invalidate_caches()` when + invalidating the caches of all cached finders. + .. class:: Loader diff --git a/Lib/importlib/__init__.py b/Lib/importlib/__init__.py --- a/Lib/importlib/__init__.py +++ b/Lib/importlib/__init__.py @@ -1,23 +1,4 @@ -"""A pure Python implementation of import. - -References on import: - - * Language reference - http://docs.python.org/ref/import.html - * __import__ function - http://docs.python.org/lib/built-in-funcs.html - * Packages - http://www.python.org/doc/essays/packages.html - * PEP 235: Import on Case-Insensitive Platforms - http://www.python.org/dev/peps/pep-0235 - * PEP 275: Import Modules from Zip Archives - http://www.python.org/dev/peps/pep-0273 - * PEP 302: New Import Hooks - http://www.python.org/dev/peps/pep-0302/ - * PEP 328: Imports: Multi-line and Absolute/Relative - http://www.python.org/dev/peps/pep-0328 - -""" +"""A pure Python implementation of import.""" __all__ = ['__import__', 'import_module', 'invalidate_caches'] from . import _bootstrap @@ -37,7 +18,15 @@ # Public API ######################################################### -from ._bootstrap import __import__, invalidate_caches +from ._bootstrap import __import__ + + +def invalidate_caches(): + """Call the invalidate_caches() method on all finders stored in + sys.path_importer_caches (where implemented).""" + for finder in sys.path_importer_cache.values(): + if hasattr(finder, 'invalidate_caches'): + finder.invalidate_caches() def import_module(name, package=None): diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -160,17 +160,6 @@ # Finder/loader utility code ################################################## -_cache_refresh = 0 - -def invalidate_caches(): - """Invalidate importlib's internal caches. - - Calling this function may be needed if some modules are installed while - your program is running and you expect the program to notice the changes. - """ - global _cache_refresh - _cache_refresh += 1 - def set_package(fxn): """Set __package__ on the returned module.""" @@ -768,7 +757,10 @@ self._path_mtime = -1 self._path_cache = set() self._relaxed_path_cache = set() - self._cache_refresh = 0 + + def invalidate_caches(self): + """Invalidate the directory mtime.""" + self._path_mtime = -1 def find_module(self, fullname): """Try to find a loader for the specified module.""" @@ -777,10 +769,9 @@ mtime = _os.stat(self.path).st_mtime except OSError: mtime = -1 - if mtime != self._path_mtime or _cache_refresh != self._cache_refresh: + if mtime != self._path_mtime: self._fill_cache() self._path_mtime = mtime - self._cache_refresh = _cache_refresh # tail_module keeps the original casing, for __file__ and friends if _relax_case(): cache = self._relaxed_path_cache diff --git a/Lib/importlib/test/source/test_finder.py b/Lib/importlib/test/source/test_finder.py --- a/Lib/importlib/test/source/test_finder.py +++ b/Lib/importlib/test/source/test_finder.py @@ -143,6 +143,13 @@ finally: os.unlink('mod.py') + def test_invalidate_caches(self): + # invalidate_caches() should reset the mtime. + finder = _bootstrap._FileFinder('', _bootstrap._SourceFinderDetails()) + finder._path_mtime = 42 + finder.invalidate_caches() + self.assertEqual(finder._path_mtime, -1) + def test_main(): from test.support import run_unittest diff --git a/Lib/importlib/test/test_api.py b/Lib/importlib/test/test_api.py --- a/Lib/importlib/test/test_api.py +++ b/Lib/importlib/test/test_api.py @@ -84,6 +84,34 @@ importlib.import_module('a.b') self.assertEqual(b_load_count, 1) + +class InvalidateCacheTests(unittest.TestCase): + + def test_method_called(self): + # If defined the method should be called. + class InvalidatingNullFinder: + def __init__(self, *ignored): + self.called = False + def find_module(self, *args): + return None + def invalidate_caches(self): + self.called = True + + key = 'gobledeegook' + ins = InvalidatingNullFinder() + sys.path_importer_cache[key] = ins + self.addCleanup(lambda: sys.path_importer_cache.__delitem__(key)) + importlib.invalidate_caches() + self.assertTrue(ins.called) + + def test_method_lacking(self): + # There should be no issues if the method is not defined. + key = 'gobbledeegook' + sys.path_importer_cache[key] = imp.NullImporter('abc') + self.addCleanup(lambda: sys.path_importer_cache.__delitem__(key)) + importlib.invalidate_caches() # Shouldn't trigger an exception. + + def test_main(): from test.support import run_unittest run_unittest(ImportModuleTests) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: More debug output
by antoine.pitrou Feb. 27, 2012

Feb. 27, 2012

http://hg.python.org/cpython/rev/586e29658020 changeset: 75323:586e29658020 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Feb 27 22:01:25 2012 +0100 summary: More debug output files: Lib/test/test_imp.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py --- a/Lib/test/test_imp.py +++ b/Lib/test/test_imp.py @@ -328,12 +328,12 @@ importlib.invalidate_caches() expected___file__ = os.sep.join(('.', 'pep3147', '__init__.py')) m = __import__('pep3147') - self.assertEqual(m.__file__, expected___file__, (m.__file__, m.__path__, sys.path)) + self.assertEqual(m.__file__, expected___file__, (m.__file__, m.__path__, sys.path, sys.path_importer_cache)) # Ensure we load the pyc file. support.unload('pep3147') m = __import__('pep3147') support.unload('pep3147') - self.assertEqual(m.__file__, expected___file__, (m.__file__, m.__path__, sys.path)) + self.assertEqual(m.__file__, expected___file__, (m.__file__, m.__path__, sys.path, sys.path_importer_cache)) class NullImporterTests(unittest.TestCase): -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Improve debugging output for test failure
by antoine.pitrou Feb. 27, 2012

Feb. 27, 2012

http://hg.python.org/cpython/rev/2f8f2ad0545f changeset: 75322:2f8f2ad0545f user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Feb 27 20:04:05 2012 +0100 summary: Improve debugging output for test failure files: Lib/test/test_imp.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py --- a/Lib/test/test_imp.py +++ b/Lib/test/test_imp.py @@ -328,7 +328,7 @@ importlib.invalidate_caches() expected___file__ = os.sep.join(('.', 'pep3147', '__init__.py')) m = __import__('pep3147') - self.assertEqual(m.__file__, expected___file__, (m.__file__, m.__path__)) + self.assertEqual(m.__file__, expected___file__, (m.__file__, m.__path__, sys.path)) # Ensure we load the pyc file. support.unload('pep3147') m = __import__('pep3147') -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode.
by antoine.pitrou Feb. 27, 2012

Feb. 27, 2012

http://hg.python.org/cpython/rev/e721b2b74b59 changeset: 75321:e721b2b74b59 parent: 75319:6c737eb12c3e parent: 75320:2fd68efac05a user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Feb 27 19:56:37 2012 +0100 summary: Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode. Patch by Mikhail Novikov. files: Lib/lib2to3/tests/test_parser.py | 13 ++++++++++--- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py --- a/Lib/lib2to3/tests/test_parser.py +++ b/Lib/lib2to3/tests/test_parser.py @@ -11,10 +11,14 @@ # Testing imports from . import support from .support import driver, test_dir +from test.support import verbose # Python imports import os +import sys import unittest +import warnings +import subprocess # Local imports from lib2to3.pgen2 import tokenize @@ -171,10 +175,12 @@ try: tree = driver.parse_string(source) except ParseError as err: - print('ParseError on file', filepath, err) + if verbose > 0: + warnings.warn('ParseError on file %s (%s)' % (filepath, err)) continue new = str(tree) - if diff(filepath, new): + x = diff(filepath, new) + if x: self.fail("Idempotency failed: %s" % filepath) def test_extended_unpacking(self): @@ -183,6 +189,7 @@ driver.parse_string("(z, *y, w) = m\n") driver.parse_string("for *z, m in d: pass\n") + class TestLiterals(GrammarTest): def validate(self, s): @@ -221,7 +228,7 @@ with open('@', 'w') as f: f.write(str(result)) fn = fn.replace('"', '\\"') - return os.system('diff -u "%s" @' % fn) + return subprocess.call(['diff', '-u', fn, '@'], stdout=(subprocess.DEVNULL if verbose < 1 else None)) finally: try: os.remove("@") diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -725,6 +725,7 @@ Tim Northover Joe Norton Neal Norwitz +Mikhail Novikov Michal Nowikowski Steffen Daode Nurpmeso Nigel O'Brian diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -508,6 +508,9 @@ Library ------- +- Issue #13125: Silence spurious test_lib2to3 output when in non-verbose mode. + Patch by Mikhail Novikov. + - Issue #11841: Fix comparison bug with 'rc' versions in packaging.version. Patch by Filip Gruszczyński. -- Repository URL: http://hg.python.org/cpython

1 0