Mailman 3 July 2011 - Python-checkins

cpython (3.2): Document that atexit execution order is undefined (#9788)
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/e37fa30c4be4 changeset: 71604:e37fa30c4be4 branch: 3.2 user: Éric Araujo <merwok(a)netwok.org> date: Fri Jul 29 18:04:24 2011 +0200 summary: Document that atexit execution order is undefined (#9788) files: Doc/library/atexit.rst | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Doc/library/atexit.rst b/Doc/library/atexit.rst --- a/Doc/library/atexit.rst +++ b/Doc/library/atexit.rst @@ -9,7 +9,9 @@ The :mod:`atexit` module defines functions to register and unregister cleanup functions. Functions thus registered are automatically executed upon normal -interpreter termination. +interpreter termination. The order in which the functions are called is not +defined; if you have cleanup operations that depend on each other, you should +wrap them in a function and register that one. This keeps :mod:`atexit` simple. Note: the functions registered via this module are not called when the program is killed by a signal not handled by Python, when a Python fatal internal error -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Let the doc of __import__ link to importlib (#9254).
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/7bfc0a45542c changeset: 71602:7bfc0a45542c branch: 3.2 parent: 71600:f02a8f906342 user: Éric Araujo <merwok(a)netwok.org> date: Fri Jul 29 17:50:58 2011 +0200 summary: Let the doc of __import__ link to importlib (#9254). importlib.import_module eschews a number of issues that __import__ has. Reviewed by Brett Cannon. (The docstring of __import__ was already updated in 3d490c3a019e, for #7397.) files: Doc/library/functions.rst | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst --- a/Doc/library/functions.rst +++ b/Doc/library/functions.rst @@ -1387,7 +1387,7 @@ .. note:: This is an advanced function that is not needed in everyday Python - programming. + programming, unlike :func:`importlib.import_module`. This function is invoked by the :keyword:`import` statement. It can be replaced (by importing the :mod:`builtins` module and assigning to @@ -1437,15 +1437,8 @@ names. If you simply want to import a module (potentially within a package) by name, - you can call :func:`__import__` and then look it up in :data:`sys.modules`:: + use :func:`importlib.import_module`. - >>> import sys - >>> name = 'foo.bar.baz' - >>> __import__(name) - <module 'foo' from ...> - >>> baz = sys.modules[name] - >>> baz - <module 'foo.bar.baz' from ...> .. rubric:: Footnotes -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Add a link target for argparse.Namespace (#8982)
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/939631c6bc6f changeset: 71603:939631c6bc6f branch: 3.2 user: Éric Araujo <merwok(a)netwok.org> date: Fri Jul 29 17:59:17 2011 +0200 summary: Add a link target for argparse.Namespace (#8982) files: Doc/library/argparse.rst | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst --- a/Doc/library/argparse.rst +++ b/Doc/library/argparse.rst @@ -110,7 +110,7 @@ :class:`ArgumentParser` parses args through the :meth:`~ArgumentParser.parse_args` method. This will inspect the command line, convert each arg to the appropriate type and then invoke the appropriate action. -In most cases, this means a simple namespace object will be built up from +In most cases, this means a simple :class:`Namespace` object will be built up from attributes parsed out of the command line:: >>> parser.parse_args(['--sum', '7', '-1', '42']) @@ -722,7 +722,7 @@ * ``parser`` - The ArgumentParser object which contains this action. -* ``namespace`` - The namespace object that will be returned by +* ``namespace`` - The :class:`Namespace` object that will be returned by :meth:`~ArgumentParser.parse_args`. Most actions add an attribute to this object. @@ -1333,11 +1333,14 @@ The Namespace object ^^^^^^^^^^^^^^^^^^^^ -By default, :meth:`~ArgumentParser.parse_args` will return a new object of type -:class:`Namespace` where the necessary attributes have been set. This class is -deliberately simple, just an :class:`object` subclass with a readable string -representation. If you prefer to have dict-like view of the attributes, you -can use the standard Python idiom via :func:`vars`:: +.. class:: Namespace + + Simple class used by default by :meth:`~ArgumentParser.parse_args` to create + an object holding attributes and return it. + +This class is deliberately simple, just an :class:`object` subclass with a +readable string representation. If you prefer to have dict-like view of the +attributes, you can use the standard Python idiom, :func:`vars`:: >>> parser = argparse.ArgumentParser() >>> parser.add_argument('--foo') -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge fix for #8887 from 3.2
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/91d6cabf77d6 changeset: 71601:91d6cabf77d6 parent: 71597:5ba0a479c519 parent: 71600:f02a8f906342 user: Éric Araujo <merwok(a)netwok.org> date: Fri Jul 29 17:38:23 2011 +0200 summary: Merge fix for #8887 from 3.2 files: Lib/pydoc.py | 13 +++++++------ Lib/test/test_pydoc.py | 18 ++++++++++++++++++ Misc/NEWS | 3 +++ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1479,13 +1479,14 @@ else: break if module: object = module - for part in parts[n:]: - try: object = getattr(object, part) - except AttributeError: return None - return object else: - if hasattr(builtins, path): - return getattr(builtins, path) + object = builtins + for part in parts[n:]: + try: + object = getattr(object, part) + except AttributeError: + return None + return object # --------------------------------------- interactive interpreter interface diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -1,5 +1,6 @@ import os import sys +import builtins import difflib import inspect import pydoc @@ -425,6 +426,23 @@ expected = 'C in module %s object' % __name__ self.assertIn(expected, pydoc.render_doc(c)) + def test_builtin(self): + for name in ('str', 'str.translate', 'builtins.str', + 'builtins.str.translate'): + # test low-level function + self.assertIsNotNone(pydoc.locate(name)) + # test high-level function + try: + pydoc.render_doc(name) + except ImportError: + self.fail('finding the doc of {!r} failed'.format(o)) + + for name in ('notbuiltins', 'strrr', 'strr.translate', + 'str.trrrranslate', 'builtins.strrr', + 'builtins.str.trrranslate'): + self.assertIsNone(pydoc.locate(name)) + self.assertRaises(ImportError, pydoc.render_doc, name) + @unittest.skipUnless(threading, 'Threading required for this test.') class PydocServerTest(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -244,6 +244,9 @@ Library ------- +- Issue #8887: "pydoc somebuiltin.somemethod" (or help('somebuiltin.somemethod') + in Python code) now finds the doc of the method. + - Issue #10968: Remove indirection in threading. The public names (Thread, Condition, etc.) used to be factory functions returning instances of hidden classes (_Thread, _Condition, etc.), because (if Guido recalls correctly) this -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Make “pydoc somebuiltin.somemethod” work (#8887)
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/f02a8f906342 changeset: 71600:f02a8f906342 branch: 3.2 parent: 71577:742b827f8337 user: Éric Araujo <merwok(a)netwok.org> date: Fri Jul 29 17:03:55 2011 +0200 summary: Make “pydoc somebuiltin.somemethod” work (#8887) files: Lib/pydoc.py | 13 +++++++------ Lib/test/test_pydoc.py | 18 ++++++++++++++++++ Misc/NEWS | 3 +++ 3 files changed, 28 insertions(+), 6 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1482,13 +1482,14 @@ else: break if module: object = module - for part in parts[n:]: - try: object = getattr(object, part) - except AttributeError: return None - return object else: - if hasattr(builtins, path): - return getattr(builtins, path) + object = builtins + for part in parts[n:]: + try: + object = getattr(object, part) + except AttributeError: + return None + return object # --------------------------------------- interactive interpreter interface diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -1,5 +1,6 @@ import os import sys +import builtins import difflib import inspect import pydoc @@ -419,6 +420,23 @@ expected = 'C in module %s object' % __name__ self.assertIn(expected, pydoc.render_doc(c)) + def test_builtin(self): + for name in ('str', 'str.translate', 'builtins.str', + 'builtins.str.translate'): + # test low-level function + self.assertIsNotNone(pydoc.locate(name)) + # test high-level function + try: + pydoc.render_doc(name) + except ImportError: + self.fail('finding the doc of {!r} failed'.format(o)) + + for name in ('notbuiltins', 'strrr', 'strr.translate', + 'str.trrrranslate', 'builtins.strrr', + 'builtins.str.trrranslate'): + self.assertIsNone(pydoc.locate(name)) + self.assertRaises(ImportError, pydoc.render_doc, name) + @unittest.skipUnless(threading, 'Threading required for this test.') class PydocServerTest(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -41,6 +41,9 @@ Library ------- +- Issue #8887: "pydoc somebuiltin.somemethod" (or help('somebuiltin.somemethod') + in Python code) now finds the doc of the method. + - Issue #12603: Fix pydoc.synopsis() on files with non-negative st_mtime. - Issue #12514: Use try/finally to assure the timeit module restores garbage -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Make “pydoc somebuiltin.somemethod” work (#8887)
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/68df566cbf92 changeset: 71599:68df566cbf92 branch: 2.7 user: Éric Araujo <merwok(a)netwok.org> date: Fri Jul 29 17:34:35 2011 +0200 summary: Make “pydoc somebuiltin.somemethod” work (#8887) files: Lib/pydoc.py | 13 +++++++------ Lib/test/test_pydoc.py | 21 +++++++++++++++++++-- Misc/NEWS | 3 +++ 3 files changed, 29 insertions(+), 8 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -1454,13 +1454,14 @@ else: break if module: object = module - for part in parts[n:]: - try: object = getattr(object, part) - except AttributeError: return None - return object else: - if hasattr(__builtin__, path): - return getattr(__builtin__, path) + object = __builtin__ + for part in parts[n:]: + try: + object = getattr(object, part) + except AttributeError: + return None + return object # --------------------------------------- interactive interpreter interface diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py --- a/Lib/test/test_pydoc.py +++ b/Lib/test/test_pydoc.py @@ -1,8 +1,8 @@ +import os import sys -import os -import os.path import difflib import subprocess +import __builtin__ import re import pydoc import inspect @@ -357,6 +357,23 @@ self.assertEqual(sorted(pydoc.Helper.keywords), sorted(keyword.kwlist)) + def test_builtin(self): + for name in ('str', 'str.translate', '__builtin__.str', + '__builtin__.str.translate'): + # test low-level function + self.assertIsNotNone(pydoc.locate(name)) + # test high-level function + try: + pydoc.render_doc(name) + except ImportError: + self.fail('finding the doc of {!r} failed'.format(o)) + + for name in ('not__builtin__', 'strrr', 'strr.translate', + 'str.trrrranslate', '__builtin__.strrr', + '__builtin__.str.trrranslate'): + self.assertIsNone(pydoc.locate(name)) + self.assertRaises(ImportError, pydoc.render_doc, name) + def test_main(): test.test_support.run_unittest(PyDocDocTest, diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -37,6 +37,9 @@ Library ------- +- Issue #8887: "pydoc somebuiltin.somemethod" (or help('somebuiltin.somemethod') + in Python code) now finds the doc of the method. + - Issue #12603: Fix pydoc.synopsis() on files with non-negative st_mtime. - Issue #12514: Use try/finally to assure the timeit module restores garbage -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Backout duplicate changeset ed34ca4e639c
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/5b36dca0c22f changeset: 71598:5b36dca0c22f branch: 2.7 parent: 71594:ed34ca4e639c user: Éric Araujo <merwok(a)netwok.org> date: Fri Jul 29 16:28:22 2011 +0200 summary: Backout duplicate changeset ed34ca4e639c files: Doc/tutorial/interpreter.rst | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/Doc/tutorial/interpreter.rst b/Doc/tutorial/interpreter.rst --- a/Doc/tutorial/interpreter.rst +++ b/Doc/tutorial/interpreter.rst @@ -168,8 +168,6 @@ .. _tut-source-encoding: -.. _tut-source-encoding: - Source Code Encoding -------------------- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge default -> default): Merge fix for reindent.py
by jason.coombs July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/5ba0a479c519 changeset: 71597:5ba0a479c519 parent: 71595:43c41e19527a parent: 71596:2547f7965733 user: Jason R. Coombs <jaraco(a)jaraco.com> date: Fri Jul 29 09:32:25 2011 -0400 summary: Merge fix for reindent.py files: Tools/scripts/reindent.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/scripts/reindent.py b/Tools/scripts/reindent.py --- a/Tools/scripts/reindent.py +++ b/Tools/scripts/reindent.py @@ -52,6 +52,8 @@ recurse = False dryrun = False makebackup = True +"A specified newline to be used in the output (set by --newline option)" +spec_newline = None def usage(msg=None): @@ -64,11 +66,9 @@ sys.stderr.write(" ".join(str(arg) for arg in args)) sys.stderr.write("\n") - def main(): import getopt global verbose, recurse, dryrun, makebackup, spec_newline - spec_newline = None try: opts, args = getopt.getopt(sys.argv[1:], "drnvh", ["dryrun", "recurse", "nobackup", "verbose", "newline=", "help"]) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #10639: spec_newline wasn't defined globally unless main() was called;
by jason.coombs July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/2547f7965733 changeset: 71596:2547f7965733 parent: 71506:4feb889d3bed user: Jason R. Coombs <jaraco(a)jaraco.com> date: Fri Jul 29 09:31:56 2011 -0400 summary: Issue #10639: spec_newline wasn't defined globally unless main() was called; now spec_newline is set at module import/execution files: Tools/scripts/reindent.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/scripts/reindent.py b/Tools/scripts/reindent.py --- a/Tools/scripts/reindent.py +++ b/Tools/scripts/reindent.py @@ -52,6 +52,8 @@ recurse = False dryrun = False makebackup = True +"A specified newline to be used in the output (set by --newline option)" +spec_newline = None def usage(msg=None): @@ -64,11 +66,9 @@ sys.stderr.write(" ".join(str(arg) for arg in args)) sys.stderr.write("\n") - def main(): import getopt global verbose, recurse, dryrun, makebackup, spec_newline - spec_newline = None try: opts, args = getopt.getopt(sys.argv[1:], "drnvh", ["dryrun", "recurse", "nobackup", "verbose", "newline=", "help"]) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Expand shlex.quote example (#9723)
by eric.araujo July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/43c41e19527a changeset: 71595:43c41e19527a parent: 71578:9538fc35ad55 user: Éric Araujo <merwok(a)netwok.org> date: Fri Jul 29 15:08:42 2011 +0200 summary: Expand shlex.quote example (#9723) files: Doc/library/shlex.rst | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/Doc/library/shlex.rst b/Doc/library/shlex.rst --- a/Doc/library/shlex.rst +++ b/Doc/library/shlex.rst @@ -38,16 +38,33 @@ .. function:: quote(s) Return a shell-escaped version of the string *s*. The returned value is a - string that can safely be used as one token in a shell command line. - Examples:: + string that can safely be used as one token in a shell command line, for + cases where you cannot use a list. - >>> filename = 'somefile; rm -rf /home' + This idiom would be unsafe:: + + >>> filename = 'somefile; rm -rf ~' + >>> command = 'ls -l {}'.format(filename) + >>> print(command) # executed by a shell: boom! + ls -l somefile; rm -rf ~ + + :func:`quote` lets you plug the security hole:: + >>> command = 'ls -l {}'.format(quote(filename)) >>> print(command) - ls -l 'somefile; rm -rf /home' + ls -l 'somefile; rm -rf ~' >>> remote_command = 'ssh home {}'.format(quote(command)) >>> print(remote_command) - ssh home 'ls -l '"'"'somefile; rm -rf /home'"'"'' + ssh home 'ls -l '"'"'somefile; rm -rf ~'"'"'' + + The quoting is compatible with UNIX shells and with :func:`split`: + + >>> remote_command = split(remote_command) + >>> remote_command + ['ssh', 'home', "ls -l 'somefile; rm -rf ~'"] + >>> command = split(remote_command[-1]) + >>> command + ['ls', '-l', 'somefile; rm -rf ~'] The :mod:`shlex` module defines the following class: -- Repository URL: http://hg.python.org/cpython

1 0