Mailman 3 December 2011 - Python-checkins

cpython: Pass positional arguments - HTTPError is not accepting keyword arguments.
by jason.coombs Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/a3ddee916808 changeset: 73847:a3ddee916808 user: Jason R. Coombs <jaraco(a)jaraco.com> date: Sat Dec 03 23:18:11 2011 -0500 summary: Pass positional arguments - HTTPError is not accepting keyword arguments. Reference #13211 and #12555. files: Lib/test/test_urllib2.py | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -1454,7 +1454,9 @@ Issue 13211 reveals that HTTPError didn't implement the URLError interface even though HTTPError is a subclass of URLError. - >>> err = urllib.error.HTTPError(msg='something bad happened', url=None, code=None, hdrs=None, fp=None) + >>> msg = 'something bad happened' + >>> url = code = hdrs = fp = None + >>> err = urllib.error.HTTPError(msg, url, code, hdrs, fp) >>> assert hasattr(err, 'reason') >>> err.reason 'something bad happened' -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #13211: Add .reason attribute to HTTPError to implement parent class
by jason.coombs Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/abfe76a19f63 changeset: 73823:abfe76a19f63 branch: 3.2 parent: 73820:0e2812b16f5f user: Jason R. Coombs <jaraco(a)jaraco.com> date: Mon Nov 07 10:50:32 2011 -0500 summary: Issue #13211: Add .reason attribute to HTTPError to implement parent class (URLError) interface. files: Lib/test/test_urllib2.py | 11 +++++++++++ Lib/urllib/error.py | 6 ++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -1409,6 +1409,17 @@ req = Request(url) self.assertEqual(req.get_full_url(), url) +def test_HTTPError_interface(): + """ + Issue 13211 reveals that HTTPError didn't implement the URLError + interface even though HTTPError is a subclass of URLError. + + >>> err = urllib.error.HTTPError(msg='something bad happened', url=None, code=None, hdrs=None, fp=None) + >>> assert hasattr(err, 'reason') + >>> err.reason + 'something bad happened' + """ + def test_main(verbose=None): from test import test_urllib2 support.run_doctest(test_urllib2, verbose) diff --git a/Lib/urllib/error.py b/Lib/urllib/error.py --- a/Lib/urllib/error.py +++ b/Lib/urllib/error.py @@ -52,6 +52,12 @@ def __str__(self): return 'HTTP Error %s: %s' % (self.code, self.msg) + # since URLError specifies a .reason attribute, HTTPError should also + # provide this attribute. See issue13211 for discussion. + @property + def reason(self): + return self.msg + # exception raised when downloaded size does not match content-length class ContentTooShortError(URLError): def __init__(self, message, content): -- Repository URL: http://hg.python.org/cpython

2 1

peps: PEP 406 (ImportEngine API): defer this until 3.4 at the earliest, don't propose
by nick.coghlan Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/peps/rev/e2ccffa4d3b5 changeset: 4009:e2ccffa4d3b5 user: Nick Coghlan <ncoghlan(a)gmail.com> date: Sun Dec 04 12:05:01 2011 +1000 summary: PEP 406 (ImportEngine API): defer this until 3.4 at the earliest, don't propose altering the PEP 302 APIs files: pep-0406.txt | 127 +++++++++++++++++++++++--------------- 1 files changed, 77 insertions(+), 50 deletions(-) diff --git a/pep-0406.txt b/pep-0406.txt --- a/pep-0406.txt +++ b/pep-0406.txt @@ -3,11 +3,12 @@ Version: $Revision$ Last-Modified: $Date$ Author: Nick Coghlan <ncoghlan(a)gmail.com>, Greg Slodkowicz <jergosh(a)gmail.com> -Status: Draft +Status: Deferred Type: Standards Track Content-Type: text/x-rst Created: 4-Jul-2011 -Post-History: 31-Jul-2011, 13-Nov-2011 +Python-Version: 3.4 +Post-History: 31-Jul-2011, 13-Nov-2011, 4-Dec-2011 Abstract ======== @@ -18,17 +19,27 @@ an alternative to completely replacing the built-in implementation of the import statement, by overriding the ``__import__()`` function. To work with the builtin import functionality and importing via import engine objects, -module importers and loaders must accept an optional ``engine`` parameter. In -that sense, this PEP constitutes a revision of finder and loader interfaces -described in PEP 302 [1]_. However, the standard import process will not -supply the additional argument, so this proposal remains fully backwards -compatible. +this PEP proposes a context management based approach to temporarily replacing +the global import state. The PEP also proposes inclusion of a ``GlobalImportEngine`` subclass and a globally accessible instance of that class, which "writes through" to the -process global state and invokes importers and loaders without the additional -``engine`` argument. This provides a backwards compatible bridge between the -proposed encapsulated API and the legacy process global state. +process global state. This provides a backwards compatible bridge between the +proposed encapsulated API and the legacy process global state, and allows +straightforward support for related state updates (e.g. selectively +invalidating path cache entries when ``sys.path`` is modified). + + +PEP Deferral +============ + +The import system is already seeing substantial changes in Python 3.3, to +natively handle packages split across multiple directories (PEP 382) and +(potentially) to make the import semantics in the main module better match +those in other modules (PEP 395). + +Accordingly, the proposal in this PEP will not be seriously considered until +Python 3.4 at the earliest. Rationale @@ -58,6 +69,10 @@ *additional* process global state, in order to correctly update package paths as ``sys.path`` is modified. +Finally, providing a coherent object for all this state makes it feasible to +also provide context management features that allow the import state to be +temporarily substituted. + Proposal ======== @@ -68,11 +83,10 @@ desired and also an ``import_module()`` method, equivalent to ``importlib.import_module()`` [3]_. -Since the new style finders and loaders should also have the option to -modify the global import state, we introduce a ``GlobalImportState`` -class with an interface identical to ``ImportEngine`` but taking -advantage of the global state. This can be easily implemented using -class properties. +Since there are global import state invariants that are assumed and should be +maintained, we introduce a ``GlobalImportState`` class with an interface +identical to ``ImportEngine`` but directly accessing the current global import +state. This can be easily implemented using class properties. Specification @@ -121,6 +135,14 @@ methods like ``ImportEngine`` but writes through to the global state in ``sys``. +To support various namespace package mechanisms, when ``sys.path`` is altered, +tools like ``pkgutil.extend_path`` should be used to also modify other parts +of the import state (in this case, package ``__path__`` attributes). The path +importer cache should also be invalidated when a variety of changes are made. + +The ``ImportEngine`` API will provide convenience methods that automatically +make related import state updates as part of a single operation. + Global variables ~~~~~~~~~~~~~~~~ @@ -133,24 +155,26 @@ a copy of the process global import state. -Necessary changes to finder/loader interfaces: -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +No changes to finder/loader interfaces +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -``find_module (cls, fullname, path=None, engine=None)`` +Rather than attempting to update the PEP 302 APIs to accept additional state, +this PEP proposes that ``ImportEngine`` support the content management +protocol (similar to the context substitution mechanisms in the ``decimal`` +module). -``load_module (cls, fullname, path=None, engine=None)`` +The context management mechanism for ``ImportEngine`` would: -The only difference between engine compatible and PEP 302 compatible -finders/loaders is the presence of an additional ``engine`` parameter. -This is intended to specify an ImportEngine instance or subclass thereof. -This parameter is optional so that engine compatible finders and -loaders can be made backwards compatible with PEP 302 calling conventions by -falling back on ``engine.sysengine`` with the following simple pattern:: +* On entry: + * Acquire the import lock + * Substitute the global import state with the import engine's own state +* On exit: + * Restore the previous global import state + * Release the import lock - def find_module(cls, fullname, path=None, engine=None): - if not engine: - engine = importlib.engine.sysengine - ... +The precise API for this is TBD (but will probably use a distinct context +management object, along the lines of that created by +``decimal.localcontext``). Open Issues @@ -185,35 +209,38 @@ cache - it's only loading them directly which causes problems. -Nested imports -~~~~~~~~~~~~~~ +Scope of substitution +~~~~~~~~~~~~~~~~~~~~~ -The reference implementation currently applies only to the outermost import. -Any imports by the module being imported will be handled using the standard -import machinery. +Related to the previous open issue is the question of what state to substitute +when using the context management API. It is currently the case that replacing +``sys.modules`` can be unreliable due to cached references and there's the +underlying fact that having independent copies of some modules is simply +impossible due to platform limitations. -One way to handle this is to place the burden on the implementation of module -loaders to set ``module.__dict__["__import__"] = engine.__import__`` before -running the module's code. The ``importlib`` design facilities this by -allowing the change to be made in one place (``_LoaderBasics._load_module``). +As part of this PEP, it will be necessary to document explicitly: - -Scope of API updates -~~~~~~~~~~~~~~~~~~~~ - -The reference implementation focuses on finding and loading modules. There -may be other PEP 302 APIs that should also be updated to accept an optional -``engine`` parameter. +* Which parts of the global import state can be substituted (and declare code + which caches references to that state without dealing with the substitution + case buggy) +* Which parts must be modified in-place (and hence are not substituted by the + ``ImportEngine`` context management API, or otherwise scoped to + ``ImportEngine`` instances) Reference Implementation ======================== -A reference implementation [4]_ based on Brett Cannon's importlib has been -developed by Greg Slodkowicz as part of the 2011 Google Summer of Code. Note -that the current implementation avoids modifying existing code, and hence -duplicates a lot of things unnecessarily. An actual implementation would just -modify any such affected code in place. +A reference implementation [4]_ for an earlier draft of this PEP, based on +Brett Cannon's importlib has been developed by Greg Slodkowicz as part of the +2011 Google Summer of Code. Note that the current implementation avoids +modifying existing code, and hence duplicates a lot of things unnecessarily. +An actual implementation would just modify any such affected code in place. + +That earlier draft of the PEP proposed change the PEP 302 APIs to support passing +in an optional engine instance. This had the (serious) downside of not correctly +affecting further imports from the imported module, hence the change to the +context management based proposal for substituting the global state. References -- Repository URL: http://hg.python.org/peps

1 0

cpython (merge 3.2 -> default): Merge from 3.2
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/f09477693434 changeset: 73846:f09477693434 parent: 73842:abd2adbfceb7 parent: 73845:bf0c5cd303e5 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 23:10:12 2011 +0100 summary: Merge from 3.2 files: Doc/faq/design.rst | 131 +++++++++++++------------------- 1 files changed, 55 insertions(+), 76 deletions(-) diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst --- a/Doc/faq/design.rst +++ b/Doc/faq/design.rst @@ -380,11 +380,24 @@ Can Python be compiled to machine code, C or some other language? ----------------------------------------------------------------- -Not easily. Python's high level data types, dynamic typing of objects and +Practical answer: + +`Cython <http://cython.org/>`_ and `Pyrex <http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/>`_ +compile a modified version of Python with optional annotations into C +extensions. `Weave <http://www.scipy.org/Weave>`_ makes it easy to +intermingle Python and C code in various ways to increase performance. +`Nuitka <http://www.nuitka.net/>`_ is an up-and-coming compiler of Python +into C++ code, aiming to support the full Python language. + +Theoretical answer: + + .. XXX not sure what to make of this + +Not trivially. Python's high level data types, dynamic typing of objects and run-time invocation of the interpreter (using :func:`eval` or :func:`exec`) -together mean that a "compiled" Python program would probably consist mostly of -calls into the Python run-time system, even for seemingly simple operations like -``x+1``. +together mean that a naïvely "compiled" Python program would probably consist +mostly of calls into the Python run-time system, even for seemingly simple +operations like ``x+1``. Several projects described in the Python newsgroup or at past `Python conferences <http://python.org/community/workshops/>`_ have shown that this @@ -395,99 +408,64 @@ from the `1997 Python conference <http://python.org/workshops/1997-10/proceedings/>`_ for more information.) -Internally, Python source code is always translated into a bytecode -representation, and this bytecode is then executed by the Python virtual -machine. In order to avoid the overhead of repeatedly parsing and translating -modules that rarely change, this byte code is written into a file whose name -ends in ".pyc" whenever a module is parsed. When the corresponding .py file is -changed, it is parsed and translated again and the .pyc file is rewritten. - -There is no performance difference once the .pyc file has been loaded, as the -bytecode read from the .pyc file is exactly the same as the bytecode created by -direct translation. The only difference is that loading code from a .pyc file -is faster than parsing and translating a .py file, so the presence of -precompiled .pyc files improves the start-up time of Python scripts. If -desired, the Lib/compileall.py module can be used to create valid .pyc files for -a given set of modules. - -Note that the main script executed by Python, even if its filename ends in .py, -is not compiled to a .pyc file. It is compiled to bytecode, but the bytecode is -not saved to a file. Usually main scripts are quite short, so this doesn't cost -much speed. - -.. XXX check which of these projects are still alive - -There are also several programs which make it easier to intermingle Python and C -code in various ways to increase performance. See, for example, `Cython -<http://cython.org/>`_, `Pyrex -<http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/>`_ and `Weave -<http://www.scipy.org/Weave>`_. - How does Python manage memory? ------------------------------ The details of Python memory management depend on the implementation. The -standard C implementation of Python uses reference counting to detect -inaccessible objects, and another mechanism to collect reference cycles, +standard implementation of Python, :term:`CPython`, uses reference counting to +detect inaccessible objects, and another mechanism to collect reference cycles, periodically executing a cycle detection algorithm which looks for inaccessible cycles and deletes the objects involved. The :mod:`gc` module provides functions to perform a garbage collection, obtain debugging statistics, and tune the collector's parameters. -Jython relies on the Java runtime so the JVM's garbage collector is used. This -difference can cause some subtle porting problems if your Python code depends on -the behavior of the reference counting implementation. +Other implementations (such as `Jython <http://www.jython.org>`_ or +`PyPy <http://www.pypy.org>`_), however, can rely on a different mechanism +such as a full-blown garbage collector. This difference can cause some +subtle porting problems if your Python code depends on the behavior of the +reference counting implementation. -.. XXX relevant for Python 3? +In some Python implementations, the following code (which is fine in CPython) +will probably run out of file descriptors:: - Sometimes objects get stuck in traceback temporarily and hence are not - deallocated when you might expect. Clear the traceback with:: + for file in very_long_list_of_files: + f = open(file) + c = f.read(1) - import sys - sys.last_traceback = None +Indeed, using CPython's reference counting and destructor scheme, each new +assignment to *f* closes the previous file. With a traditional GC, however, +those file objects will only get collected (and closed) at varying and possibly +long intervals. - Tracebacks are used for reporting errors, implementing debuggers and related - things. They contain a portion of the program state extracted during the - handling of an exception (usually the most recent exception). +If you want to write code that will work with any Python implementation, +you should explicitly close the file or use the :keyword:`with` statement; +this will work regardless of memory management scheme:: -In the absence of circularities, Python programs do not need to manage memory -explicitly. + for file in very_long_list_of_files: + with open(file) as f: + c = f.read(1) -Why doesn't Python use a more traditional garbage collection scheme? For one -thing, this is not a C standard feature and hence it's not portable. (Yes, we -know about the Boehm GC library. It has bits of assembler code for *most* -common platforms, not for all of them, and although it is mostly transparent, it -isn't completely transparent; patches are required to get Python to work with -it.) + +Why doesn't CPython use a more traditional garbage collection scheme? +--------------------------------------------------------------------- + +For one thing, this is not a C standard feature and hence it's not portable. +(Yes, we know about the Boehm GC library. It has bits of assembler code for +*most* common platforms, not for all of them, and although it is mostly +transparent, it isn't completely transparent; patches are required to get +Python to work with it.) Traditional GC also becomes a problem when Python is embedded into other applications. While in a standalone Python it's fine to replace the standard malloc() and free() with versions provided by the GC library, an application embedding Python may want to have its *own* substitute for malloc() and free(), -and may not want Python's. Right now, Python works with anything that +and may not want Python's. Right now, CPython works with anything that implements malloc() and free() properly. -In Jython, the following code (which is fine in CPython) will probably run out -of file descriptors long before it runs out of memory:: - for file in very_long_list_of_files: - f = open(file) - c = f.read(1) - -Using the current reference counting and destructor scheme, each new assignment -to f closes the previous file. Using GC, this is not guaranteed. If you want -to write code that will work with any Python implementation, you should -explicitly close the file or use the :keyword:`with` statement; this will work -regardless of GC:: - - for file in very_long_list_of_files: - with open(file) as f: - c = f.read(1) - - -Why isn't all memory freed when Python exits? ---------------------------------------------- +Why isn't all memory freed when CPython exits? +---------------------------------------------- Objects referenced from the global namespaces of Python modules are not always deallocated when Python exits. This may happen if there are circular @@ -647,10 +625,10 @@ you won't be fooled into accidentally overwriting a list when you need a sorted copy but also need to keep the unsorted version around. -In Python 2.4 a new built-in function -- :func:`sorted` -- has been added. -This function creates a new list from a provided iterable, sorts it and returns -it. For example, here's how to iterate over the keys of a dictionary in sorted -order:: +If you want to return a new list, use the built-in :func:`sorted` function +instead. This function creates a new list from a provided iterable, sorts +it and returns it. For example, here's how to iterate over the keys of a +dictionary in sorted order:: for key in sorted(mydict): ... # do whatever with mydict[key]... -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Break down and refine memory management question
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/29fc3c23c73d changeset: 73844:29fc3c23c73d branch: 3.2 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 23:06:50 2011 +0100 summary: Break down and refine memory management question files: Doc/faq/design.rst | 74 +++++++++++++++------------------ 1 files changed, 34 insertions(+), 40 deletions(-) diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst --- a/Doc/faq/design.rst +++ b/Doc/faq/design.rst @@ -413,66 +413,59 @@ ------------------------------ The details of Python memory management depend on the implementation. The -standard C implementation of Python uses reference counting to detect -inaccessible objects, and another mechanism to collect reference cycles, +standard implementation of Python, :term:`CPython`, uses reference counting to +detect inaccessible objects, and another mechanism to collect reference cycles, periodically executing a cycle detection algorithm which looks for inaccessible cycles and deletes the objects involved. The :mod:`gc` module provides functions to perform a garbage collection, obtain debugging statistics, and tune the collector's parameters. -Jython relies on the Java runtime so the JVM's garbage collector is used. This -difference can cause some subtle porting problems if your Python code depends on -the behavior of the reference counting implementation. +Other implementations (such as `Jython <http://www.jython.org>`_ or +`PyPy <http://www.pypy.org>`_), however, can rely on a different mechanism +such as a full-blown garbage collector. This difference can cause some +subtle porting problems if your Python code depends on the behavior of the +reference counting implementation. -.. XXX relevant for Python 3? +In some Python implementations, the following code (which is fine in CPython) +will probably run out of file descriptors:: - Sometimes objects get stuck in traceback temporarily and hence are not - deallocated when you might expect. Clear the traceback with:: + for file in very_long_list_of_files: + f = open(file) + c = f.read(1) - import sys - sys.last_traceback = None +Indeed, using CPython's reference counting and destructor scheme, each new +assignment to *f* closes the previous file. With a traditional GC, however, +those file objects will only get collected (and closed) at varying and possibly +long intervals. - Tracebacks are used for reporting errors, implementing debuggers and related - things. They contain a portion of the program state extracted during the - handling of an exception (usually the most recent exception). +If you want to write code that will work with any Python implementation, +you should explicitly close the file or use the :keyword:`with` statement; +this will work regardless of memory management scheme:: -In the absence of circularities, Python programs do not need to manage memory -explicitly. + for file in very_long_list_of_files: + with open(file) as f: + c = f.read(1) -Why doesn't Python use a more traditional garbage collection scheme? For one -thing, this is not a C standard feature and hence it's not portable. (Yes, we -know about the Boehm GC library. It has bits of assembler code for *most* -common platforms, not for all of them, and although it is mostly transparent, it -isn't completely transparent; patches are required to get Python to work with -it.) + +Why doesn't CPython use a more traditional garbage collection scheme? +--------------------------------------------------------------------- + +For one thing, this is not a C standard feature and hence it's not portable. +(Yes, we know about the Boehm GC library. It has bits of assembler code for +*most* common platforms, not for all of them, and although it is mostly +transparent, it isn't completely transparent; patches are required to get +Python to work with it.) Traditional GC also becomes a problem when Python is embedded into other applications. While in a standalone Python it's fine to replace the standard malloc() and free() with versions provided by the GC library, an application embedding Python may want to have its *own* substitute for malloc() and free(), -and may not want Python's. Right now, Python works with anything that +and may not want Python's. Right now, CPython works with anything that implements malloc() and free() properly. -In Jython, the following code (which is fine in CPython) will probably run out -of file descriptors long before it runs out of memory:: - for file in very_long_list_of_files: - f = open(file) - c = f.read(1) - -Using the current reference counting and destructor scheme, each new assignment -to f closes the previous file. Using GC, this is not guaranteed. If you want -to write code that will work with any Python implementation, you should -explicitly close the file or use the :keyword:`with` statement; this will work -regardless of GC:: - - for file in very_long_list_of_files: - with open(file) as f: - c = f.read(1) - - -Why isn't all memory freed when Python exits? ---------------------------------------------- +Why isn't all memory freed when CPython exits? +---------------------------------------------- Objects referenced from the global namespaces of Python modules are not always deallocated when Python exits. This may happen if there are circular -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Streamline mention of sorted()
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/bf0c5cd303e5 changeset: 73845:bf0c5cd303e5 branch: 3.2 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 23:08:57 2011 +0100 summary: Streamline mention of sorted() files: Doc/faq/design.rst | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst --- a/Doc/faq/design.rst +++ b/Doc/faq/design.rst @@ -625,10 +625,10 @@ you won't be fooled into accidentally overwriting a list when you need a sorted copy but also need to keep the unsorted version around. -In Python 2.4 a new built-in function -- :func:`sorted` -- has been added. -This function creates a new list from a provided iterable, sorts it and returns -it. For example, here's how to iterate over the keys of a dictionary in sorted -order:: +If you want to return a new list, use the built-in :func:`sorted` function +instead. This function creates a new list from a provided iterable, sorts +it and returns it. For example, here's how to iterate over the keys of a +dictionary in sorted order:: for key in sorted(mydict): ... # do whatever with mydict[key]... -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Reformulate answer, and remove off-topic discussion of bytecode in a question
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/00fdd8b1e17b changeset: 73843:00fdd8b1e17b branch: 3.2 parent: 73841:01292dd6dadd user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 22:56:02 2011 +0100 summary: Reformulate answer, and remove off-topic discussion of bytecode in a question about compiling to C. files: Doc/faq/design.rst | 49 +++++++++++---------------------- 1 files changed, 17 insertions(+), 32 deletions(-) diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst --- a/Doc/faq/design.rst +++ b/Doc/faq/design.rst @@ -380,11 +380,24 @@ Can Python be compiled to machine code, C or some other language? ----------------------------------------------------------------- -Not easily. Python's high level data types, dynamic typing of objects and +Practical answer: + +`Cython <http://cython.org/>`_ and `Pyrex <http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/>`_ +compile a modified version of Python with optional annotations into C +extensions. `Weave <http://www.scipy.org/Weave>`_ makes it easy to +intermingle Python and C code in various ways to increase performance. +`Nuitka <http://www.nuitka.net/>`_ is an up-and-coming compiler of Python +into C++ code, aiming to support the full Python language. + +Theoretical answer: + + .. XXX not sure what to make of this + +Not trivially. Python's high level data types, dynamic typing of objects and run-time invocation of the interpreter (using :func:`eval` or :func:`exec`) -together mean that a "compiled" Python program would probably consist mostly of -calls into the Python run-time system, even for seemingly simple operations like -``x+1``. +together mean that a naïvely "compiled" Python program would probably consist +mostly of calls into the Python run-time system, even for seemingly simple +operations like ``x+1``. Several projects described in the Python newsgroup or at past `Python conferences <http://python.org/community/workshops/>`_ have shown that this @@ -395,34 +408,6 @@ from the `1997 Python conference <http://python.org/workshops/1997-10/proceedings/>`_ for more information.) -Internally, Python source code is always translated into a bytecode -representation, and this bytecode is then executed by the Python virtual -machine. In order to avoid the overhead of repeatedly parsing and translating -modules that rarely change, this byte code is written into a file whose name -ends in ".pyc" whenever a module is parsed. When the corresponding .py file is -changed, it is parsed and translated again and the .pyc file is rewritten. - -There is no performance difference once the .pyc file has been loaded, as the -bytecode read from the .pyc file is exactly the same as the bytecode created by -direct translation. The only difference is that loading code from a .pyc file -is faster than parsing and translating a .py file, so the presence of -precompiled .pyc files improves the start-up time of Python scripts. If -desired, the Lib/compileall.py module can be used to create valid .pyc files for -a given set of modules. - -Note that the main script executed by Python, even if its filename ends in .py, -is not compiled to a .pyc file. It is compiled to bytecode, but the bytecode is -not saved to a file. Usually main scripts are quite short, so this doesn't cost -much speed. - -.. XXX check which of these projects are still alive - -There are also several programs which make it easier to intermingle Python and C -code in various ways to increase performance. See, for example, `Cython -<http://cython.org/>`_, `Pyrex -<http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/>`_ and `Weave -<http://www.scipy.org/Weave>`_. - How does Python manage memory? ------------------------------ -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge from 3.2
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/abd2adbfceb7 changeset: 73842:abd2adbfceb7 parent: 73837:3d96c2dbec13 parent: 73841:01292dd6dadd user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 22:40:23 2011 +0100 summary: Merge from 3.2 files: Doc/faq/extending.rst | 28 +++++++++++++---------- Doc/faq/general.rst | 36 +------------------------------ 2 files changed, 17 insertions(+), 47 deletions(-) diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst --- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -99,12 +99,7 @@ How do I use Py_BuildValue() to create a tuple of arbitrary length? ------------------------------------------------------------------- -You can't. Use ``t = PyTuple_New(n)`` instead, and fill it with objects using -``PyTuple_SetItem(t, i, o)`` -- note that this "eats" a reference count of -``o``, so you have to :c:func:`Py_INCREF` it. Lists have similar functions -``PyList_New(n)`` and ``PyList_SetItem(l, i, o)``. Note that you *must* set all -the tuple items to some value before you pass the tuple to Python code -- -``PyTuple_New(n)`` initializes them to NULL, which isn't a valid Python value. +You can't. Use :c:func:`PyTuple_Pack` instead. How do I call an object's method from C? @@ -147,21 +142,30 @@ just allow the standard traceback mechanism to work. Then, the output will go wherever your ``write()`` method sends it. -The easiest way to do this is to use the StringIO class in the standard library. +The easiest way to do this is to use the :class:`io.StringIO` class:: -Sample code and use for catching stdout: + >>> import io, sys + >>> sys.stdout = io.StringIO() + >>> print('foo') + >>> print('hello world!') + >>> sys.stderr.write(sys.stdout.getvalue()) + foo + hello world! - >>> class StdoutCatcher: +A custom object to do the same would look like this:: + + >>> import io, sys + >>> class StdoutCatcher(io.TextIOBase): ... def __init__(self): - ... self.data = '' + ... self.data = [] ... def write(self, stuff): - ... self.data = self.data + stuff + ... self.data.append(stuff) ... >>> import sys >>> sys.stdout = StdoutCatcher() >>> print('foo') >>> print('hello world!') - >>> sys.stderr.write(sys.stdout.data) + >>> sys.stderr.write(''.join(sys.stdout.data)) foo hello world! diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -19,7 +19,7 @@ window systems, and is extensible in C or C++. It is also usable as an extension language for applications that need a programmable interface. Finally, Python is portable: it runs on many Unix variants, on the Mac, and on -PCs under MS-DOS, Windows, Windows NT, and OS/2. +Windows 2000 and later. To find out more, start with :ref:`tutorial-index`. The `Beginner's Guide to Python <http://wiki.python.org/moin/BeginnersGuide>`_ links to other @@ -469,38 +469,3 @@ If you want to discuss Python's use in education, you may be interested in joining `the edu-sig mailing list <http://python.org/community/sigs/current/edu-sig>`_. - - -Upgrading Python -================ - -What is this bsddb185 module my application keeps complaining about? --------------------------------------------------------------------- - -.. XXX remove this question? - -Starting with Python2.3, the distribution includes the `PyBSDDB package -<http://pybsddb.sf.net/>` as a replacement for the old bsddb module. It -includes functions which provide backward compatibility at the API level, but -requires a newer version of the underlying `Berkeley DB -<http://www.sleepycat.com>`_ library. Files created with the older bsddb module -can't be opened directly using the new module. - -Using your old version of Python and a pair of scripts which are part of Python -2.3 (db2pickle.py and pickle2db.py, in the Tools/scripts directory) you can -convert your old database files to the new format. Using your old Python -version, run the db2pickle.py script to convert it to a pickle, e.g.:: - - python2.2 <pathto>/db2pickley.py database.db database.pck - -Rename your database file:: - - mv database.db olddatabase.db - -Now convert the pickle file to a new format database:: - - python <pathto>/pickle2db.py database.db database.pck - -The precise commands you use will vary depending on the particulars of your -installation. For full details about operation of these two scripts check the -doc string at the start of each one. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Fix compatibility statement.
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/01292dd6dadd changeset: 73841:01292dd6dadd branch: 3.2 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 22:39:13 2011 +0100 summary: Fix compatibility statement. files: Doc/faq/general.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -19,7 +19,7 @@ window systems, and is extensible in C or C++. It is also usable as an extension language for applications that need a programmable interface. Finally, Python is portable: it runs on many Unix variants, on the Mac, and on -PCs under MS-DOS, Windows, Windows NT, and OS/2. +Windows 2000 and later. To find out more, start with :ref:`tutorial-index`. The `Beginner's Guide to Python <http://wiki.python.org/moin/BeginnersGuide>`_ links to other -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Remove outdated question (the bsddb module isn't included anymore)
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/040c751e5497 changeset: 73840:040c751e5497 branch: 3.2 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 22:37:14 2011 +0100 summary: Remove outdated question (the bsddb module isn't included anymore) files: Doc/faq/general.rst | 34 --------------------------------- 1 files changed, 0 insertions(+), 34 deletions(-) diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst --- a/Doc/faq/general.rst +++ b/Doc/faq/general.rst @@ -469,38 +469,3 @@ If you want to discuss Python's use in education, you may be interested in joining `the edu-sig mailing list <http://python.org/community/sigs/current/edu-sig>`_. - - -Upgrading Python -================ - -What is this bsddb185 module my application keeps complaining about? --------------------------------------------------------------------- - -.. XXX remove this question? - -Starting with Python2.3, the distribution includes the `PyBSDDB package -<http://pybsddb.sf.net/>` as a replacement for the old bsddb module. It -includes functions which provide backward compatibility at the API level, but -requires a newer version of the underlying `Berkeley DB -<http://www.sleepycat.com>`_ library. Files created with the older bsddb module -can't be opened directly using the new module. - -Using your old version of Python and a pair of scripts which are part of Python -2.3 (db2pickle.py and pickle2db.py, in the Tools/scripts directory) you can -convert your old database files to the new format. Using your old Python -version, run the db2pickle.py script to convert it to a pickle, e.g.:: - - python2.2 <pathto>/db2pickley.py database.db database.pck - -Rename your database file:: - - mv database.db olddatabase.db - -Now convert the pickle file to a new format database:: - - python <pathto>/pickle2db.py database.db database.pck - -The precise commands you use will vary depending on the particulars of your -installation. For full details about operation of these two scripts check the -doc string at the start of each one. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Advocate PyTuple_Pack instead of manual building of tuples
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/8267af6f370d changeset: 73838:8267af6f370d branch: 3.2 parent: 73836:93f64ae51fff user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 22:30:19 2011 +0100 summary: Advocate PyTuple_Pack instead of manual building of tuples files: Doc/faq/extending.rst | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst --- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -99,12 +99,7 @@ How do I use Py_BuildValue() to create a tuple of arbitrary length? ------------------------------------------------------------------- -You can't. Use ``t = PyTuple_New(n)`` instead, and fill it with objects using -``PyTuple_SetItem(t, i, o)`` -- note that this "eats" a reference count of -``o``, so you have to :c:func:`Py_INCREF` it. Lists have similar functions -``PyList_New(n)`` and ``PyList_SetItem(l, i, o)``. Note that you *must* set all -the tuple items to some value before you pass the tuple to Python code -- -``PyTuple_New(n)`` initializes them to NULL, which isn't a valid Python value. +You can't. Use :c:func:`PyTuple_Pack` instead. How do I call an object's method from C? -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Refine FAQ entry for catching stdout
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/c82492fc9943 changeset: 73839:c82492fc9943 branch: 3.2 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 22:35:31 2011 +0100 summary: Refine FAQ entry for catching stdout files: Doc/faq/extending.rst | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst --- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -142,21 +142,30 @@ just allow the standard traceback mechanism to work. Then, the output will go wherever your ``write()`` method sends it. -The easiest way to do this is to use the StringIO class in the standard library. +The easiest way to do this is to use the :class:`io.StringIO` class:: -Sample code and use for catching stdout: + >>> import io, sys + >>> sys.stdout = io.StringIO() + >>> print('foo') + >>> print('hello world!') + >>> sys.stderr.write(sys.stdout.getvalue()) + foo + hello world! - >>> class StdoutCatcher: +A custom object to do the same would look like this:: + + >>> import io, sys + >>> class StdoutCatcher(io.TextIOBase): ... def __init__(self): - ... self.data = '' + ... self.data = [] ... def write(self, stuff): - ... self.data = self.data + stuff + ... self.data.append(stuff) ... >>> import sys >>> sys.stdout = StdoutCatcher() >>> print('foo') >>> print('hello world!') - >>> sys.stderr.write(sys.stdout.data) + >>> sys.stderr.write(''.join(sys.stdout.data)) foo hello world! -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Remove outdated FAQ content
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/3d96c2dbec13 changeset: 73837:3d96c2dbec13 parent: 73835:10440e132cfb parent: 73836:93f64ae51fff user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 22:26:01 2011 +0100 summary: Remove outdated FAQ content files: Doc/faq/programming.rst | 40 +++++----------------------- 1 files changed, 8 insertions(+), 32 deletions(-) diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -901,11 +901,11 @@ Is there an equivalent to Perl's chomp() for removing trailing newlines from strings? ------------------------------------------------------------------------------------- -Starting with Python 2.2, you can use ``S.rstrip("\r\n")`` to remove all -occurrences of any line terminator from the end of the string ``S`` without -removing other trailing whitespace. If the string ``S`` represents more than -one line, with several empty lines at the end, the line terminators for all the -blank lines will be removed:: +You can use ``S.rstrip("\r\n")`` to remove all occurrences of any line +terminator from the end of the string ``S`` without removing other trailing +whitespace. If the string ``S`` represents more than one line, with several +empty lines at the end, the line terminators for all the blank lines will +be removed:: >>> lines = ("line 1 \r\n" ... "\r\n" @@ -916,15 +916,6 @@ Since this is typically only desired when reading text one line at a time, using ``S.rstrip()`` this way works well. -For older versions of Python, there are two partial substitutes: - -- If you want to remove all trailing whitespace, use the ``rstrip()`` method of - string objects. This removes all trailing whitespace, not just a single - newline. - -- Otherwise, if there is only one line in the string ``S``, use - ``S.splitlines()[0]``. - Is there a scanf() or sscanf() equivalent? ------------------------------------------ @@ -1042,15 +1033,8 @@ else: last = mylist[i] -If all elements of the list may be used as dictionary keys (i.e. they are all -hashable) this is often faster :: - - d = {} - for x in mylist: - d[x] = 1 - mylist = list(d.keys()) - -In Python 2.5 and later, the following is possible instead:: +If all elements of the list may be used as set keys (i.e. they are all +:term:`hashable`) this is often faster :: mylist = list(set(mylist)) @@ -1420,15 +1404,7 @@ C.count = 314 -Static methods are possible since Python 2.2:: - - class C: - def static(arg1, arg2, arg3): - # No 'self' parameter! - ... - static = staticmethod(static) - -With Python 2.4's decorators, this can also be written as :: +Static methods are possible:: class C: @staticmethod -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Remove outdate FAQ content
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/93f64ae51fff changeset: 73836:93f64ae51fff branch: 3.2 parent: 73834:140b8c98c7b9 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 22:19:55 2011 +0100 summary: Remove outdate FAQ content files: Doc/faq/programming.rst | 40 +++++----------------------- 1 files changed, 8 insertions(+), 32 deletions(-) diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -901,11 +901,11 @@ Is there an equivalent to Perl's chomp() for removing trailing newlines from strings? ------------------------------------------------------------------------------------- -Starting with Python 2.2, you can use ``S.rstrip("\r\n")`` to remove all -occurrences of any line terminator from the end of the string ``S`` without -removing other trailing whitespace. If the string ``S`` represents more than -one line, with several empty lines at the end, the line terminators for all the -blank lines will be removed:: +You can use ``S.rstrip("\r\n")`` to remove all occurrences of any line +terminator from the end of the string ``S`` without removing other trailing +whitespace. If the string ``S`` represents more than one line, with several +empty lines at the end, the line terminators for all the blank lines will +be removed:: >>> lines = ("line 1 \r\n" ... "\r\n" @@ -916,15 +916,6 @@ Since this is typically only desired when reading text one line at a time, using ``S.rstrip()`` this way works well. -For older versions of Python, there are two partial substitutes: - -- If you want to remove all trailing whitespace, use the ``rstrip()`` method of - string objects. This removes all trailing whitespace, not just a single - newline. - -- Otherwise, if there is only one line in the string ``S``, use - ``S.splitlines()[0]``. - Is there a scanf() or sscanf() equivalent? ------------------------------------------ @@ -1042,15 +1033,8 @@ else: last = mylist[i] -If all elements of the list may be used as dictionary keys (i.e. they are all -hashable) this is often faster :: - - d = {} - for x in mylist: - d[x] = 1 - mylist = list(d.keys()) - -In Python 2.5 and later, the following is possible instead:: +If all elements of the list may be used as set keys (i.e. they are all +:term:`hashable`) this is often faster :: mylist = list(set(mylist)) @@ -1420,15 +1404,7 @@ C.count = 314 -Static methods are possible since Python 2.2:: - - class C: - def static(arg1, arg2, arg3): - # No 'self' parameter! - ... - static = staticmethod(static) - -With Python 2.4's decorators, this can also be written as :: +Static methods are possible:: class C: @staticmethod -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Streamline FAQ entry about the ternary operator, and suggest using io.StringIO
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/140b8c98c7b9 changeset: 73834:140b8c98c7b9 branch: 3.2 parent: 73832:48a723092e1e user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 22:11:11 2011 +0100 summary: Streamline FAQ entry about the ternary operator, and suggest using io.StringIO for a mutable unicode container. files: Doc/faq/programming.rst | 74 +++++++--------------------- 1 files changed, 20 insertions(+), 54 deletions(-) diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -679,61 +679,21 @@ Is there an equivalent of C's "?:" ternary operator? ---------------------------------------------------- -Yes, this feature was added in Python 2.5. The syntax would be as follows:: +Yes, there is. The syntax is as follows:: [on_true] if [expression] else [on_false] x, y = 50, 25 - small = x if x < y else y -For versions previous to 2.5 the answer would be 'No'. +Before this syntax was introduced in Python 2.5, a common idiom was to use +logical operators:: -.. XXX remove rest? + [expression] and [on_true] or [on_false] -In many cases you can mimic ``a ? b : c`` with ``a and b or c``, but there's a -flaw: if *b* is zero (or empty, or ``None`` -- anything that tests false) then -*c* will be selected instead. In many cases you can prove by looking at the -code that this can't happen (e.g. because *b* is a constant or has a type that -can never be false), but in general this can be a problem. - -Tim Peters (who wishes it was Steve Majewski) suggested the following solution: -``(a and [b] or [c])[0]``. Because ``[b]`` is a singleton list it is never -false, so the wrong path is never taken; then applying ``[0]`` to the whole -thing gets the *b* or *c* that you really wanted. Ugly, but it gets you there -in the rare cases where it is really inconvenient to rewrite your code using -'if'. - -The best course is usually to write a simple ``if...else`` statement. Another -solution is to implement the ``?:`` operator as a function:: - - def q(cond, on_true, on_false): - if cond: - if not isfunction(on_true): - return on_true - else: - return on_true() - else: - if not isfunction(on_false): - return on_false - else: - return on_false() - -In most cases you'll pass b and c directly: ``q(a, b, c)``. To avoid evaluating -b or c when they shouldn't be, encapsulate them within a lambda function, e.g.: -``q(a, lambda: b, lambda: c)``. - -It has been asked *why* Python has no if-then-else expression. There are -several answers: many languages do just fine without one; it can easily lead to -less readable code; no sufficiently "Pythonic" syntax has been discovered; a -search of the standard library found remarkably few places where using an -if-then-else expression would make the code more understandable. - -In 2002, :pep:`308` was written proposing several possible syntaxes and the -community was asked to vote on the issue. The vote was inconclusive. Most -people liked one of the syntaxes, but also hated other syntaxes; many votes -implied that people preferred no ternary operator rather than having a syntax -they hated. +However, this idiom is unsafe, as it can give wrong results when *on_true* +has a false boolean value. Therefore, it is always better to use +the ``... if ... else ...`` form. Is it possible to write obfuscated one-liners in Python? @@ -852,15 +812,21 @@ How do I modify a string in place? ---------------------------------- -You can't, because strings are immutable. If you need an object with this -ability, try converting the string to a list or use the array module:: +You can't, because strings are immutable. In most situations, you should +simply construct a new string from the various parts you want to assemble +it from. However, if you need an object with the ability to modify in-place +unicode data, try using a :class:`io.StringIO` object or the :mod:`array` +module:: >>> s = "Hello, world" - >>> a = list(s) - >>> print(a) - ['H', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd'] - >>> a[7:] = list("there!") - >>> ''.join(a) + >>> sio = io.StringIO(s) + >>> sio.getvalue() + 'Hello, world' + >>> sio.seek(7) + 7 + >>> sio.write("there!") + 6 + >>> sio.getvalue() 'Hello, there!' >>> import array -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Streamline FAQ entry about the ternary operator, and suggest using io.StringIO
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/10440e132cfb changeset: 73835:10440e132cfb parent: 73833:06087f6890af parent: 73834:140b8c98c7b9 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 22:11:45 2011 +0100 summary: Streamline FAQ entry about the ternary operator, and suggest using io.StringIO for a mutable unicode container. files: Doc/faq/programming.rst | 74 +++++++--------------------- 1 files changed, 20 insertions(+), 54 deletions(-) diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -679,61 +679,21 @@ Is there an equivalent of C's "?:" ternary operator? ---------------------------------------------------- -Yes, this feature was added in Python 2.5. The syntax would be as follows:: +Yes, there is. The syntax is as follows:: [on_true] if [expression] else [on_false] x, y = 50, 25 - small = x if x < y else y -For versions previous to 2.5 the answer would be 'No'. +Before this syntax was introduced in Python 2.5, a common idiom was to use +logical operators:: -.. XXX remove rest? + [expression] and [on_true] or [on_false] -In many cases you can mimic ``a ? b : c`` with ``a and b or c``, but there's a -flaw: if *b* is zero (or empty, or ``None`` -- anything that tests false) then -*c* will be selected instead. In many cases you can prove by looking at the -code that this can't happen (e.g. because *b* is a constant or has a type that -can never be false), but in general this can be a problem. - -Tim Peters (who wishes it was Steve Majewski) suggested the following solution: -``(a and [b] or [c])[0]``. Because ``[b]`` is a singleton list it is never -false, so the wrong path is never taken; then applying ``[0]`` to the whole -thing gets the *b* or *c* that you really wanted. Ugly, but it gets you there -in the rare cases where it is really inconvenient to rewrite your code using -'if'. - -The best course is usually to write a simple ``if...else`` statement. Another -solution is to implement the ``?:`` operator as a function:: - - def q(cond, on_true, on_false): - if cond: - if not isfunction(on_true): - return on_true - else: - return on_true() - else: - if not isfunction(on_false): - return on_false - else: - return on_false() - -In most cases you'll pass b and c directly: ``q(a, b, c)``. To avoid evaluating -b or c when they shouldn't be, encapsulate them within a lambda function, e.g.: -``q(a, lambda: b, lambda: c)``. - -It has been asked *why* Python has no if-then-else expression. There are -several answers: many languages do just fine without one; it can easily lead to -less readable code; no sufficiently "Pythonic" syntax has been discovered; a -search of the standard library found remarkably few places where using an -if-then-else expression would make the code more understandable. - -In 2002, :pep:`308` was written proposing several possible syntaxes and the -community was asked to vote on the issue. The vote was inconclusive. Most -people liked one of the syntaxes, but also hated other syntaxes; many votes -implied that people preferred no ternary operator rather than having a syntax -they hated. +However, this idiom is unsafe, as it can give wrong results when *on_true* +has a false boolean value. Therefore, it is always better to use +the ``... if ... else ...`` form. Is it possible to write obfuscated one-liners in Python? @@ -852,15 +812,21 @@ How do I modify a string in place? ---------------------------------- -You can't, because strings are immutable. If you need an object with this -ability, try converting the string to a list or use the array module:: +You can't, because strings are immutable. In most situations, you should +simply construct a new string from the various parts you want to assemble +it from. However, if you need an object with the ability to modify in-place +unicode data, try using a :class:`io.StringIO` object or the :mod:`array` +module:: >>> s = "Hello, world" - >>> a = list(s) - >>> print(a) - ['H', 'e', 'l', 'l', 'o', ',', ' ', 'w', 'o', 'r', 'l', 'd'] - >>> a[7:] = list("there!") - >>> ''.join(a) + >>> sio = io.StringIO(s) + >>> sio.getvalue() + 'Hello, world' + >>> sio.seek(7) + 7 + >>> sio.write("there!") + 6 + >>> sio.getvalue() 'Hello, there!' >>> import array -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Remove references to psyco, which is mostly unmaintained and doesn't work with
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/06087f6890af changeset: 73833:06087f6890af parent: 73831:309f12301de2 parent: 73832:48a723092e1e user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 21:25:17 2011 +0100 summary: Remove references to psyco, which is mostly unmaintained and doesn't work with Python 3. files: Doc/faq/extending.rst | 8 +------- Doc/faq/programming.rst | 14 +++----------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst --- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -37,13 +37,7 @@ There are a number of alternatives to writing your own C extensions, depending on what you're trying to do. -.. XXX make sure these all work; mention Cython - -If you need more speed, `Psyco <http://psyco.sourceforge.net/>`_ generates x86 -assembly code from Python bytecode. You can use Psyco to compile the most -time-critical functions in your code, and gain a significant improvement with -very little effort, as long as you're running on a machine with an -x86-compatible processor. +.. XXX make sure these all work `Cython <http://cython.org>`_ and its relative `Pyrex <http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/>`_ are compilers diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -121,19 +121,11 @@ That's a tough one, in general. There are many tricks to speed up Python code; consider rewriting parts in C as a last resort. -In some cases it's possible to automatically translate Python to C or x86 -assembly language, meaning that you don't have to modify your code to gain -increased speed. - -.. XXX seems to have overlap with other questions! - `Cython <http://cython.org>`_ and `Pyrex <http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/>`_ can compile a slightly modified version of Python code into a C extension, and -can be used on many different platforms. - -`Psyco <http://psyco.sourceforge.net>`_ is a just-in-time compiler that -translates Python code into x86 assembly language. If you can use it, Psyco can -provide dramatic speedups for critical functions. +can be used on many different platforms. Depending on your code, Cython +may be able to make it significantly faster than when run by the Python +interpreter. The rest of this answer will discuss various tricks for squeezing a bit more speed out of Python code. *Never* apply any optimization tricks unless you know -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Remove references to psyco, which is mostly unmaintained and doesn't work with
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/48a723092e1e changeset: 73832:48a723092e1e branch: 3.2 parent: 73830:bc3f1629d825 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 21:21:36 2011 +0100 summary: Remove references to psyco, which is mostly unmaintained and doesn't work with Python 3. files: Doc/faq/extending.rst | 8 +------- Doc/faq/programming.rst | 14 +++----------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/Doc/faq/extending.rst b/Doc/faq/extending.rst --- a/Doc/faq/extending.rst +++ b/Doc/faq/extending.rst @@ -37,13 +37,7 @@ There are a number of alternatives to writing your own C extensions, depending on what you're trying to do. -.. XXX make sure these all work; mention Cython - -If you need more speed, `Psyco <http://psyco.sourceforge.net/>`_ generates x86 -assembly code from Python bytecode. You can use Psyco to compile the most -time-critical functions in your code, and gain a significant improvement with -very little effort, as long as you're running on a machine with an -x86-compatible processor. +.. XXX make sure these all work `Cython <http://cython.org>`_ and its relative `Pyrex <http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/>`_ are compilers diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -121,19 +121,11 @@ That's a tough one, in general. There are many tricks to speed up Python code; consider rewriting parts in C as a last resort. -In some cases it's possible to automatically translate Python to C or x86 -assembly language, meaning that you don't have to modify your code to gain -increased speed. - -.. XXX seems to have overlap with other questions! - `Cython <http://cython.org>`_ and `Pyrex <http://www.cosc.canterbury.ac.nz/~greg/python/Pyrex/>`_ can compile a slightly modified version of Python code into a C extension, and -can be used on many different platforms. - -`Psyco <http://psyco.sourceforge.net>`_ is a just-in-time compiler that -translates Python code into x86 assembly language. If you can use it, Psyco can -provide dramatic speedups for critical functions. +can be used on many different platforms. Depending on your code, Cython +may be able to make it significantly faster than when run by the Python +interpreter. The rest of this answer will discuss various tricks for squeezing a bit more speed out of Python code. *Never* apply any optimization tricks unless you know -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Mention PySide in the "other GUIs" page.
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/bc3f1629d825 changeset: 73830:bc3f1629d825 branch: 3.2 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 21:07:01 2011 +0100 summary: Mention PySide in the "other GUIs" page. files: Doc/library/othergui.rst | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst --- a/Doc/library/othergui.rst +++ b/Doc/library/othergui.rst @@ -61,6 +61,11 @@ with Python and Qt <http://www.qtrac.eu/pyqtbook.html>`_, by Mark Summerfield. + `PySide <http://www.pyside.org/>`_ + is a newer binding to the Qt toolkit, provided by Nokia. + Compared to PyQt, its licensing scheme is friendlier to non-open source + applications. + `wxPython <http://www.wxpython.org>`_ wxPython is a cross-platform GUI toolkit for Python that is built around the popular `wxWidgets <http://www.wxwidgets.org/>`_ (formerly wxWindows) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge doc fixes from 3.2
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/309f12301de2 changeset: 73831:309f12301de2 parent: 73828:ab5bc05ac223 parent: 73830:bc3f1629d825 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 21:07:50 2011 +0100 summary: Merge doc fixes from 3.2 files: Doc/faq/gui.rst | 8 ++++++-- Doc/library/othergui.rst | 21 ++++++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst --- a/Doc/faq/gui.rst +++ b/Doc/faq/gui.rst @@ -68,8 +68,12 @@ Gtk+ ---- -PyGtk bindings for the `Gtk+ toolkit <http://www.gtk.org>`_ have been -implemented by James Henstridge; see <http://www.pygtk.org>. +The `GObject introspection bindings <https://live.gnome.org/PyGObject>`_ +for Python allow you to write GTK+ 3 applications. There is also a +`Python GTK+ 3 Tutorial <http://python-gtk-3-tutorial.readthedocs.org/en/latest/>`_. + +The older PyGtk bindings for the `Gtk+ 2 toolkit <http://www.gtk.org>`_ have +been implemented by James Henstridge; see <http://www.pygtk.org>. FLTK ---- diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst --- a/Doc/library/othergui.rst +++ b/Doc/library/othergui.rst @@ -34,11 +34,17 @@ .. seealso:: - `PyGTK <http://www.pygtk.org/>`_ - is a set of bindings for the `GTK <http://www.gtk.org/>`_ widget set. It - provides an object oriented interface that is slightly higher level than - the C one. It comes with many more widgets than Tkinter provides, and has - good Python-specific reference documentation. There are also bindings to + `PyGObject <https://live.gnome.org/PyGObject>`_ + provides introspection bindings for C libraries using + `GObject <http://developer.gnome.org/gobject/stable/>`_. One of + these libraries is the `GTK+ 3 <http://www.gtk.org/>`_ widget set. + GTK+ comes with many more widgets than Tkinter provides. An online + `Python GTK+ 3 Tutorial <http://python-gtk-3-tutorial.readthedocs.org/en/latest/>`_ + is available. + + `PyGTK <http://www.pygtk.org/>`_ provides bindings for an older version + of the library, GTK+ 2. It provides an object oriented interface that + is slightly higher level than the C one. There are also bindings to `GNOME <http://www.gnome.org>`_. One well known PyGTK application is `PythonCAD <http://www.pythoncad.org/>`_. An online `tutorial <http://www.pygtk.org/pygtk2tutorial/index.html>`_ is available. @@ -55,6 +61,11 @@ with Python and Qt <http://www.qtrac.eu/pyqtbook.html>`_, by Mark Summerfield. + `PySide <http://www.pyside.org/>`_ + is a newer binding to the Qt toolkit, provided by Nokia. + Compared to PyQt, its licensing scheme is friendlier to non-open source + applications. + `wxPython <http://www.wxpython.org>`_ wxPython is a cross-platform GUI toolkit for Python that is built around the popular `wxWidgets <http://www.wxwidgets.org/>`_ (formerly wxWindows) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Mention the new GTK+ 3 bindings.
by antoine.pitrou Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/1e3f09a896da changeset: 73829:1e3f09a896da branch: 3.2 parent: 73827:9792e812198f user: Antoine Pitrou <solipsis(a)pitrou.net> date: Sat Dec 03 20:59:24 2011 +0100 summary: Mention the new GTK+ 3 bindings. files: Doc/faq/gui.rst | 8 ++++++-- Doc/library/othergui.rst | 16 +++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst --- a/Doc/faq/gui.rst +++ b/Doc/faq/gui.rst @@ -68,8 +68,12 @@ Gtk+ ---- -PyGtk bindings for the `Gtk+ toolkit <http://www.gtk.org>`_ have been -implemented by James Henstridge; see <http://www.pygtk.org>. +The `GObject introspection bindings <https://live.gnome.org/PyGObject>`_ +for Python allow you to write GTK+ 3 applications. There is also a +`Python GTK+ 3 Tutorial <http://python-gtk-3-tutorial.readthedocs.org/en/latest/>`_. + +The older PyGtk bindings for the `Gtk+ 2 toolkit <http://www.gtk.org>`_ have +been implemented by James Henstridge; see <http://www.pygtk.org>. FLTK ---- diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst --- a/Doc/library/othergui.rst +++ b/Doc/library/othergui.rst @@ -34,11 +34,17 @@ .. seealso:: - `PyGTK <http://www.pygtk.org/>`_ - is a set of bindings for the `GTK <http://www.gtk.org/>`_ widget set. It - provides an object oriented interface that is slightly higher level than - the C one. It comes with many more widgets than Tkinter provides, and has - good Python-specific reference documentation. There are also bindings to + `PyGObject <https://live.gnome.org/PyGObject>`_ + provides introspection bindings for C libraries using + `GObject <http://developer.gnome.org/gobject/stable/>`_. One of + these libraries is the `GTK+ 3 <http://www.gtk.org/>`_ widget set. + GTK+ comes with many more widgets than Tkinter provides. An online + `Python GTK+ 3 Tutorial <http://python-gtk-3-tutorial.readthedocs.org/en/latest/>`_ + is available. + + `PyGTK <http://www.pygtk.org/>`_ provides bindings for an older version + of the library, GTK+ 2. It provides an object oriented interface that + is slightly higher level than the C one. There are also bindings to `GNOME <http://www.gnome.org>`_. One well known PyGTK application is `PythonCAD <http://www.pythoncad.org/>`_. An online `tutorial <http://www.pygtk.org/pygtk2tutorial/index.html>`_ is available. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #13513: IOBase docs incorrectly link to the readline module
by meador.inge Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/ab5bc05ac223 changeset: 73828:ab5bc05ac223 parent: 73825:9ffb00748a47 parent: 73827:9792e812198f user: Meador Inge <meadori(a)gmail.com> date: Sat Dec 03 12:50:18 2011 -0600 summary: Issue #13513: IOBase docs incorrectly link to the readline module files: Doc/library/io.rst | 2 +- Misc/NEWS | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Doc/library/io.rst b/Doc/library/io.rst --- a/Doc/library/io.rst +++ b/Doc/library/io.rst @@ -213,7 +213,7 @@ :class:`IOBase` object can be iterated over yielding the lines in a stream. Lines are defined slightly differently depending on whether the stream is a binary stream (yielding bytes), or a text stream (yielding character - strings). See :meth:`readline` below. + strings). See :meth:`~IOBase.readline` below. IOBase is also a context manager and therefore supports the :keyword:`with` statement. In this example, *file* is closed after the diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1885,6 +1885,9 @@ Documentation ------------- +- Issue #13513: Fix io.IOBase documentation to correctly link to the + io.IOBase.readline method instead of the readline module. + - Issue #13237: Reorganise subprocess documentation to emphasise convenience functions and the most commonly needed arguments to Popen. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #13513: IOBase docs incorrectly link to the readline module
by meador.inge Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/9792e812198f changeset: 73827:9792e812198f branch: 3.2 parent: 73823:abfe76a19f63 user: Meador Inge <meadori(a)gmail.com> date: Sat Dec 03 12:29:54 2011 -0600 summary: Issue #13513: IOBase docs incorrectly link to the readline module files: Doc/library/io.rst | 2 +- Misc/NEWS | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Doc/library/io.rst b/Doc/library/io.rst --- a/Doc/library/io.rst +++ b/Doc/library/io.rst @@ -217,7 +217,7 @@ :class:`IOBase` object can be iterated over yielding the lines in a stream. Lines are defined slightly differently depending on whether the stream is a binary stream (yielding bytes), or a text stream (yielding character - strings). See :meth:`readline` below. + strings). See :meth:`~IOBase.readline` below. IOBase is also a context manager and therefore supports the :keyword:`with` statement. In this example, *file* is closed after the diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -316,6 +316,9 @@ Documentation ------------- +- Issue #13513: Fix io.IOBase documentation to correctly link to the + io.IOBase.readline method instead of the readline module. + - Issue #13237: Reorganise subprocess documentation to emphasise convenience functions and the most commonly needed arguments to Popen. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #13513: IOBase docs incorrectly link to the readline module
by meador.inge Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/fb8b6d310fb8 changeset: 73826:fb8b6d310fb8 branch: 2.7 parent: 73822:ee94b89f65ab user: Meador Inge <meadori(a)gmail.com> date: Sat Dec 03 12:13:42 2011 -0600 summary: Issue #13513: IOBase docs incorrectly link to the readline module files: Doc/library/io.rst | 2 +- Misc/NEWS | 3 +++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Doc/library/io.rst b/Doc/library/io.rst --- a/Doc/library/io.rst +++ b/Doc/library/io.rst @@ -233,7 +233,7 @@ :class:`IOBase` object can be iterated over yielding the lines in a stream. Lines are defined slightly differently depending on whether the stream is a binary stream (yielding :class:`bytes`), or a text stream (yielding - :class:`unicode` strings). See :meth:`readline` below. + :class:`unicode` strings). See :meth:`~IOBase.readline` below. IOBase is also a context manager and therefore supports the :keyword:`with` statement. In this example, *file* is closed after the diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -430,6 +430,9 @@ Documentation ------------- +- Issue #13513: Fix io.IOBase documentation to correctly link to the + io.IOBase.readline method instead of the readline module. + - Issue #13237: Reorganise subprocess documentation to emphasise convenience functions and the most commonly needed arguments to Popen. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix glitches in email.policy docs (#12208)
by eric.araujo Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/9ffb00748a47 changeset: 73825:9ffb00748a47 user: Éric Araujo <merwok(a)netwok.org> date: Sat Dec 03 16:00:56 2011 +0100 summary: Fix glitches in email.policy docs (#12208) files: Doc/library/email.policy.rst | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Doc/library/email.policy.rst b/Doc/library/email.policy.rst --- a/Doc/library/email.policy.rst +++ b/Doc/library/email.policy.rst @@ -48,16 +48,18 @@ >>> import email.policy >>> from subprocess import Popen, PIPE >>> with open('mymsg.txt', 'b') as f: - ... Msg = msg_from_binary_file(f, policy=email.policy.mbox) + ... msg = msg_from_binary_file(f, policy=email.policy.mbox) >>> p = Popen(['sendmail', msg['To'][0].address], stdin=PIPE) >>> g = BytesGenerator(p.stdin, policy=email.policy.SMTP) >>> g.flatten(msg) >>> p.stdin.close() >>> rc = p.wait() +.. XXX email.policy.mbox/MBOX does not exist yet + Some email package methods accept a *policy* keyword argument, allowing the policy to be overridden for that method. For example, the following code uses -the :meth:`email.message.Message.as_string` method of the *msg* object from the +the :meth:`~email.message.Message.as_string` method of the *msg* object from the previous example and re-write it to a file using the native line separators for the platform on which it is running:: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merged fix for #13211 from 3.2
by jason.coombs Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/deb60efd32eb changeset: 73824:deb60efd32eb parent: 73821:51af35bd46f7 parent: 73823:abfe76a19f63 user: Jason R. Coombs <jaraco(a)jaraco.com> date: Sat Dec 03 09:39:58 2011 -0500 summary: Merged fix for #13211 from 3.2 files: Lib/test/test_urllib2.py | 11 +++++++++++ Lib/urllib/error.py | 6 ++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -1449,6 +1449,17 @@ req = Request(url) self.assertEqual(req.get_full_url(), url) +def test_HTTPError_interface(): + """ + Issue 13211 reveals that HTTPError didn't implement the URLError + interface even though HTTPError is a subclass of URLError. + + >>> err = urllib.error.HTTPError(msg='something bad happened', url=None, code=None, hdrs=None, fp=None) + >>> assert hasattr(err, 'reason') + >>> err.reason + 'something bad happened' + """ + def test_main(verbose=None): from test import test_urllib2 support.run_doctest(test_urllib2, verbose) diff --git a/Lib/urllib/error.py b/Lib/urllib/error.py --- a/Lib/urllib/error.py +++ b/Lib/urllib/error.py @@ -55,6 +55,12 @@ def __str__(self): return 'HTTP Error %s: %s' % (self.code, self.msg) + # since URLError specifies a .reason attribute, HTTPError should also + # provide this attribute. See issue13211 for discussion. + @property + def reason(self): + return self.msg + # exception raised when downloaded size does not match content-length class ContentTooShortError(URLError): def __init__(self, message, content): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #13211: Add .reason attribute to HTTPError to implement parent class
by jason.coombs Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/ee94b89f65ab changeset: 73822:ee94b89f65ab branch: 2.7 parent: 73815:6e03ab9950f6 user: Jason R. Coombs <jaraco(a)jaraco.com> date: Mon Nov 07 10:44:25 2011 -0500 summary: Issue #13211: Add .reason attribute to HTTPError to implement parent class (URLError) interface. files: Lib/test/test_urllib2.py | 11 +++++++++++ Lib/urllib2.py | 6 ++++++ 2 files changed, 17 insertions(+), 0 deletions(-) diff --git a/Lib/test/test_urllib2.py b/Lib/test/test_urllib2.py --- a/Lib/test/test_urllib2.py +++ b/Lib/test/test_urllib2.py @@ -1318,6 +1318,17 @@ req = Request(url) self.assertEqual(req.get_full_url(), url) +def test_HTTPError_interface(): + """ + Issue 13211 reveals that HTTPError didn't implement the URLError + interface even though HTTPError is a subclass of URLError. + + >>> err = urllib2.HTTPError(msg='something bad happened', url=None, code=None, hdrs=None, fp=None) + >>> assert hasattr(err, 'reason') + >>> err.reason + 'something bad happened' + """ + def test_main(verbose=None): from test import test_urllib2 test_support.run_doctest(test_urllib2, verbose) diff --git a/Lib/urllib2.py b/Lib/urllib2.py --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -166,6 +166,12 @@ def __str__(self): return 'HTTP Error %s: %s' % (self.code, self.msg) + # since URLError specifies a .reason attribute, HTTPError should also + # provide this attribute. See issue13211 fo discussion. + @property + def reason(self): + return self.msg + # copied from cookielib.py _cut_port_re = re.compile(r":\d+$") def request_host(request): -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Merge fix for Issue #12666 from 3.2
by jason.coombs Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/51af35bd46f7 changeset: 73821:51af35bd46f7 parent: 73818:3eb73f45a614 parent: 73820:0e2812b16f5f user: Jason R. Coombs <jaraco(a)jaraco.com> date: Sat Dec 03 08:59:53 2011 -0500 summary: Merge fix for Issue #12666 from 3.2 files: Doc/howto/pyporting.rst | 12 ++++++++++++ Doc/whatsnew/3.0.rst | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletions(-) diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst --- a/Doc/howto/pyporting.rst +++ b/Doc/howto/pyporting.rst @@ -505,6 +505,18 @@ to :mod:`unittest`. +Update `map` for imbalanced input sequences +''''''''''''''''''''''''''''''''''''''''''' + +With Python 2, `map` would pad input sequences of unequal length with +`None` values, returning a sequence as long as the longest input sequence. + +With Python 3, if the input sequences to `map` are of unequal length, `map` +will stop at the termination of the shortest of the sequences. For full +compatibility with `map` from Python 2.x, also wrap the sequences in +:func:`itertools.zip_longest`, e.g. ``map(func, *sequences)`` becomes +``list(map(func, itertools.zip_longest(*sequences)))``. + Eliminate ``-3`` Warnings ------------------------- diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -154,7 +154,9 @@ :meth:`dict.itervalues` methods are no longer supported. * :func:`map` and :func:`filter` return iterators. If you really need - a list, a quick fix is e.g. ``list(map(...))``, but a better fix is + a list and the input sequences are all of equal length, a quick + fix is to wrap :func:`map` in :func:`list`, e.g. ``list(map(...))``, + but a better fix is often to use a list comprehension (especially when the original code uses :keyword:`lambda`), or rewriting the code so it doesn't need a list at all. Particularly tricky is :func:`map` invoked for the @@ -162,6 +164,12 @@ regular :keyword:`for` loop (since creating a list would just be wasteful). + If the input sequences are not of equal length, :func:`map` will + stop at the termination of the shortest of the sequences. For full + compatibility with `map` from Python 2.x, also wrap the sequences in + :func:`itertools.zip_longest`, e.g. ``map(func, *sequences)`` becomes + ``list(map(func, itertools.zip_longest(*sequences)))``. + * :func:`range` now behaves like :func:`xrange` used to behave, except it works with values of arbitrary size. The latter no longer exists. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12666: Added section about map changes.
by jason.coombs Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/0e2812b16f5f changeset: 73820:0e2812b16f5f branch: 3.2 user: Jason R. Coombs <jaraco(a)jaraco.com> date: Sat Dec 03 08:24:21 2011 -0500 summary: Issue #12666: Added section about map changes. files: Doc/howto/pyporting.rst | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst --- a/Doc/howto/pyporting.rst +++ b/Doc/howto/pyporting.rst @@ -505,6 +505,18 @@ to :mod:`unittest`. +Update `map` for imbalanced input sequences +''''''''''''''''''''''''''''''''''''''''''' + +With Python 2, `map` would pad input sequences of unequal length with +`None` values, returning a sequence as long as the longest input sequence. + +With Python 3, if the input sequences to `map` are of unequal length, `map` +will stop at the termination of the shortest of the sequences. For full +compatibility with `map` from Python 2.x, also wrap the sequences in +:func:`itertools.zip_longest`, e.g. ``map(func, *sequences)`` becomes +``list(map(func, itertools.zip_longest(*sequences)))``. + Eliminate ``-3`` Warnings ------------------------- -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12666: Clarifying changes in map for Python 3
by jason.coombs Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/3b505df38fd8 changeset: 73819:3b505df38fd8 branch: 3.2 parent: 73816:cc559e1e3bd8 user: Jason R. Coombs <jaraco(a)jaraco.com> date: Mon Aug 01 17:51:34 2011 -0400 summary: Issue #12666: Clarifying changes in map for Python 3 files: Doc/whatsnew/3.0.rst | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/Doc/whatsnew/3.0.rst b/Doc/whatsnew/3.0.rst --- a/Doc/whatsnew/3.0.rst +++ b/Doc/whatsnew/3.0.rst @@ -154,7 +154,9 @@ :meth:`dict.itervalues` methods are no longer supported. * :func:`map` and :func:`filter` return iterators. If you really need - a list, a quick fix is e.g. ``list(map(...))``, but a better fix is + a list and the input sequences are all of equal length, a quick + fix is to wrap :func:`map` in :func:`list`, e.g. ``list(map(...))``, + but a better fix is often to use a list comprehension (especially when the original code uses :keyword:`lambda`), or rewriting the code so it doesn't need a list at all. Particularly tricky is :func:`map` invoked for the @@ -162,6 +164,12 @@ regular :keyword:`for` loop (since creating a list would just be wasteful). + If the input sequences are not of equal length, :func:`map` will + stop at the termination of the shortest of the sequences. For full + compatibility with `map` from Python 2.x, also wrap the sequences in + :func:`itertools.zip_longest`, e.g. ``map(func, *sequences)`` becomes + ``list(map(func, itertools.zip_longest(*sequences)))``. + * :func:`range` now behaves like :func:`xrange` used to behave, except it works with values of arbitrary size. The latter no longer exists. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #12612: Add some Valgrind suppressions for 64-bit machines. Patch by Paul
by charles-francois.natali Dec. 3, 2011

Dec. 3, 2011

http://hg.python.org/cpython/rev/3eb73f45a614 changeset: 73818:3eb73f45a614 user: Charles-François Natali <neologix(a)free.fr> date: Sat Dec 03 14:43:57 2011 +0100 summary: Issue #12612: Add some Valgrind suppressions for 64-bit machines. Patch by Paul Price. files: Misc/ACKS | 1 + Misc/valgrind-python.supp | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -777,6 +777,7 @@ Amrit Prem Paul Prescod Donovan Preston +Paul Price Jyrki Pulliainen Steve Purcell Eduardo Pérez diff --git a/Misc/valgrind-python.supp b/Misc/valgrind-python.supp --- a/Misc/valgrind-python.supp +++ b/Misc/valgrind-python.supp @@ -137,6 +137,18 @@ ###} ### ###{ +### ADDRESS_IN_RANGE/Use of uninitialised value of size 8 +### Memcheck:Addr8 +### fun:PyObject_Free +###} +### +###{ +### ADDRESS_IN_RANGE/Use of uninitialised value of size 8 +### Memcheck:Value8 +### fun:PyObject_Free +###} +### +###{ ### ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value ### Memcheck:Cond ### fun:PyObject_Free @@ -155,6 +167,18 @@ ###} ### ###{ +### ADDRESS_IN_RANGE/Use of uninitialised value of size 8 +### Memcheck:Addr8 +### fun:PyObject_Realloc +###} +### +###{ +### ADDRESS_IN_RANGE/Use of uninitialised value of size 8 +### Memcheck:Value8 +### fun:PyObject_Realloc +###} +### +###{ ### ADDRESS_IN_RANGE/Conditional jump or move depends on uninitialised value ### Memcheck:Cond ### fun:PyObject_Realloc -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (8d60c1c89105): sum=0
by solipsis＠pitrou.net Dec. 2, 2011

Dec. 2, 2011

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

1 0

peps: Fix a spelling error.
by brett.cannon Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/peps/rev/22c2c36d0072 changeset: 4008:22c2c36d0072 user: Brett Cannon <brett(a)python.org> date: Fri Dec 02 18:31:13 2011 -0500 summary: Fix a spelling error. files: pep-0362.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-0362.txt b/pep-0362.txt --- a/pep-0362.txt +++ b/pep-0362.txt @@ -44,7 +44,7 @@ representation affecting the function it represents (but this is an `Open Issues`_). -Indirecation of signature introspection can also occur. If a +Indirection of signature introspection can also occur. If a decorator took a decorated function's signature object and set it on the decorating function then introspection could be redirected to what is actually expected instead of the typical ``*args, **kwargs`` -- Repository URL: http://hg.python.org/peps

1 0

cpython (merge 3.2 -> default): Issue #13439: Merge branch 3.2
by petri.lehtinen Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/cpython/rev/8d60c1c89105 changeset: 73817:8d60c1c89105 parent: 73814:454b97887c5a parent: 73816:cc559e1e3bd8 user: Petri Lehtinen <petri(a)digip.org> date: Fri Dec 02 21:25:39 2011 +0200 summary: Issue #13439: Merge branch 3.2 files: Lib/turtle.py | 134 ++++++++++++++++++------------------- Misc/NEWS | 2 + 2 files changed, 66 insertions(+), 70 deletions(-) diff --git a/Lib/turtle.py b/Lib/turtle.py --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -904,7 +904,7 @@ >>> poly = ((0,0),(10,-5),(0,10),(-10,-5)) >>> s = Shape("compound") >>> s.addcomponent(poly, "red", "blue") - ### .. add more components and then use register_shape() + >>> # .. add more components and then use register_shape() """ if self._type != "compound": raise TurtleGraphicsError("Cannot add component to %s Shape" @@ -1002,7 +1002,7 @@ no backgroundimage, no eventbindings and tracing on. Example (for a TurtleScreen instance named screen): - screen.clear() + >>> screen.clear() Note: this method is not available as function. """ @@ -1076,8 +1076,8 @@ Example (for a TurtleScreen instance named screen): >>> screen.setworldcoordinates(-10,-0.5,50,1.5) >>> for _ in range(36): - left(10) - forward(0.5) + ... left(10) + ... forward(0.5) """ if self.mode() != "world": self.mode("world") @@ -1181,7 +1181,7 @@ >>> screen.colormode() 1.0 >>> screen.colormode(255) - >>> turtle.pencolor(240,160,80) + >>> pencolor(240,160,80) """ if cmode is None: return self._colormode @@ -1249,9 +1249,9 @@ >>> screen.tracer(8, 25) >>> dist = 2 >>> for i in range(200): - fd(dist) - rt(90) - dist += 2 + ... fd(dist) + ... rt(90) + ... dist += 2 """ if n is None: return self._tracing @@ -1278,7 +1278,7 @@ self._delayvalue = int(delay) def _incrementudc(self): - "Increment upadate counter.""" + """Increment upadate counter.""" if not TurtleScreen._RUNNING: TurtleScreen._RUNNNING = True raise Terminator @@ -1346,16 +1346,12 @@ clicked point on the canvas. num -- the number of the mouse-button, defaults to 1 - Example (for a TurtleScreen instance named screen - and a Turtle instance named turtle): - - >>> screen.onclick(turtle.goto) - - ### Subsequently clicking into the TurtleScreen will - ### make the turtle move to the clicked point. + Example (for a TurtleScreen instance named screen) + + >>> screen.onclick(goto) + >>> # Subsequently clicking into the TurtleScreen will + >>> # make the turtle move to the clicked point. >>> screen.onclick(None) - - ### event-binding will be removed """ self._onscreenclick(fun, btn, add) @@ -1369,20 +1365,18 @@ In order to be able to register key-events, TurtleScreen must have focus. (See method listen.) - Example (for a TurtleScreen instance named screen - and a Turtle instance named turtle): + Example (for a TurtleScreen instance named screen): >>> def f(): - fd(50) - lt(60) - - + ... fd(50) + ... lt(60) + ... >>> screen.onkey(f, "Up") >>> screen.listen() - ### Subsequently the turtle can be moved by - ### repeatedly pressing the up-arrow key, - ### consequently drawing a hexagon + Subsequently the turtle can be moved by repeatedly pressing + the up-arrow key, consequently drawing a hexagon + """ if fun is None: if key in self._keys: @@ -1406,16 +1400,15 @@ and a Turtle instance named turtle): >>> def f(): - fd(50) - - - >>> screen.onkey(f, "Up") + ... fd(50) + ... lt(60) + ... + >>> screen.onkeypress(f, "Up") >>> screen.listen() - ### Subsequently the turtle can be moved by - ### repeatedly pressing the up-arrow key, - ### or by keeping pressed the up-arrow key. - ### consequently drawing a hexagon. + Subsequently the turtle can be moved by repeatedly pressing + the up-arrow key, or by keeping pressed the up-arrow key. + consequently drawing a hexagon. """ if fun is None: if key in self._keys: @@ -1447,12 +1440,12 @@ >>> running = True >>> def f(): - if running: - fd(50) - lt(60) - screen.ontimer(f, 250) - - >>> f() ### makes the turtle marching around + ... if running: + ... fd(50) + ... lt(60) + ... screen.ontimer(f, 250) + ... + >>> f() # makes the turtle marching around >>> running = False """ self._ontimer(fun, t) @@ -1496,7 +1489,7 @@ Example (for a Turtle instance named turtle): >>> turtle.screensize(2000,1500) - ### e. g. to search for an erroneously escaped turtle ;-) + >>> # e.g. to search for an erroneously escaped turtle ;-) """ return self._resize(canvwidth, canvheight, bg) @@ -2084,7 +2077,7 @@ Example (for a Turtle instance named turtle): >>> turtle.pensize() 1 - turtle.pensize(10) # from here on lines of width 10 are drawn + >>> turtle.pensize(10) # from here on lines of width 10 are drawn """ if width is None: return self._pensize @@ -2559,7 +2552,7 @@ """Delete the turtle's drawings and restore its default values. No argument. -, + Delete the turtle's drawings from the screen, re-center the turtle and set variables to the default values. @@ -2606,7 +2599,7 @@ Example (for a Turtle instance named turtle): >>> while undobufferentries(): - undo() + ... undo() """ if self.undobuffer is None: return 0 @@ -2682,9 +2675,9 @@ >>> turtle.tracer(8, 25) >>> dist = 2 >>> for i in range(200): - turtle.fd(dist) - turtle.rt(90) - dist += 2 + ... turtle.fd(dist) + ... turtle.rt(90) + ... dist += 2 """ return self.screen.tracer(flag, delay) @@ -2882,7 +2875,6 @@ >>> turtle.shapesize(5,2) >>> turtle.tilt(45) >>> turtle.tiltangle() - >>> """ if angle is None: tilt = -self._tilt * (180.0/math.pi) * self._angleOrient @@ -2927,7 +2919,7 @@ >>> turtle.shapesize(4,2) >>> turtle.shearfactor(-0.5) >>> turtle.shapetransform() - >>> (4.0, -1.0, -0.0, 2.0) + (4.0, -1.0, -0.0, 2.0) """ if t11 is t12 is t21 is t22 is None: return self._shapetrafo @@ -3125,7 +3117,7 @@ Example (for a Turtle instance named turtle): >>> for i in range(8): - turtle.stamp(); turtle.fd(30) + ... turtle.stamp(); turtle.fd(30) ... >>> turtle.clearstamps(2) >>> turtle.clearstamps(-2) @@ -3301,9 +3293,9 @@ Example (for a Turtle instance named turtle): >>> turtle.begin_fill() >>> if turtle.filling(): - turtle.pensize(5) - else: - turtle.pensize(3) + ... turtle.pensize(5) + ... else: + ... turtle.pensize(3) """ return isinstance(self._fillpath, list) @@ -3533,9 +3525,9 @@ Example for the anonymous turtle, i. e. the procedural way: >>> def turn(x, y): - left(360) - - >>> onclick(turn) # Now clicking into the turtle will turn it. + ... left(360) + ... + >>> onclick(turn) # Now clicking into the turtle will turn it. >>> onclick(None) # event-binding will be removed """ self.screen._onclick(self.turtle._item, fun, btn, add) @@ -3551,16 +3543,17 @@ Example (for a MyTurtle instance named joe): >>> class MyTurtle(Turtle): - def glow(self,x,y): - self.fillcolor("red") - def unglow(self,x,y): - self.fillcolor("") - + ... def glow(self,x,y): + ... self.fillcolor("red") + ... def unglow(self,x,y): + ... self.fillcolor("") + ... >>> joe = MyTurtle() >>> joe.onclick(joe.glow) >>> joe.onrelease(joe.unglow) - ### clicking on joe turns fillcolor red, - ### unclicking turns it to transparent. + + Clicking on joe turns fillcolor red, unclicking turns it to + transparent. """ self.screen._onrelease(self.turtle._item, fun, btn, add) self._update() @@ -3579,9 +3572,9 @@ Example (for a Turtle instance named turtle): >>> turtle.ondrag(turtle.goto) - ### Subsequently clicking and dragging a Turtle will - ### move it across the screen thereby producing handdrawings - ### (if pen is down). + Subsequently clicking and dragging a Turtle will move it + across the screen thereby producing handdrawings (if pen is + down). """ self.screen._ondrag(self.turtle._item, fun, btn, add) @@ -3629,10 +3622,11 @@ Example (for a Turtle instance named turtle): >>> for i in range(4): - turtle.fd(50); turtle.lt(80) - + ... turtle.fd(50); turtle.lt(80) + ... >>> for i in range(8): - turtle.undo() + ... turtle.undo() + ... """ if self.undobuffer is None: return diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -399,6 +399,8 @@ Library ------- +- Issue #13439: Fix many errors in turtle docstrings. + - Issue #6715: Add a module 'lzma' for compression using the LZMA algorithm. Thanks to Per Øyvind Karlsen for the initial implementation. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #13439: Fix many errors in turtle docstrings.
by petri.lehtinen Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/cpython/rev/cc559e1e3bd8 changeset: 73816:cc559e1e3bd8 branch: 3.2 parent: 73813:69369fd3514b user: Petri Lehtinen <petri(a)digip.org> date: Fri Dec 02 21:24:14 2011 +0200 summary: Issue #13439: Fix many errors in turtle docstrings. files: Lib/turtle.py | 134 ++++++++++++++++++------------------- Misc/NEWS | 2 + 2 files changed, 66 insertions(+), 70 deletions(-) diff --git a/Lib/turtle.py b/Lib/turtle.py --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -905,7 +905,7 @@ >>> poly = ((0,0),(10,-5),(0,10),(-10,-5)) >>> s = Shape("compound") >>> s.addcomponent(poly, "red", "blue") - ### .. add more components and then use register_shape() + >>> # .. add more components and then use register_shape() """ if self._type != "compound": raise TurtleGraphicsError("Cannot add component to %s Shape" @@ -1003,7 +1003,7 @@ no backgroundimage, no eventbindings and tracing on. Example (for a TurtleScreen instance named screen): - screen.clear() + >>> screen.clear() Note: this method is not available as function. """ @@ -1077,8 +1077,8 @@ Example (for a TurtleScreen instance named screen): >>> screen.setworldcoordinates(-10,-0.5,50,1.5) >>> for _ in range(36): - left(10) - forward(0.5) + ... left(10) + ... forward(0.5) """ if self.mode() != "world": self.mode("world") @@ -1182,7 +1182,7 @@ >>> screen.colormode() 1.0 >>> screen.colormode(255) - >>> turtle.pencolor(240,160,80) + >>> pencolor(240,160,80) """ if cmode is None: return self._colormode @@ -1250,9 +1250,9 @@ >>> screen.tracer(8, 25) >>> dist = 2 >>> for i in range(200): - fd(dist) - rt(90) - dist += 2 + ... fd(dist) + ... rt(90) + ... dist += 2 """ if n is None: return self._tracing @@ -1279,7 +1279,7 @@ self._delayvalue = int(delay) def _incrementudc(self): - "Increment upadate counter.""" + """Increment upadate counter.""" if not TurtleScreen._RUNNING: TurtleScreen._RUNNNING = True raise Terminator @@ -1347,16 +1347,12 @@ clicked point on the canvas. num -- the number of the mouse-button, defaults to 1 - Example (for a TurtleScreen instance named screen - and a Turtle instance named turtle): - - >>> screen.onclick(turtle.goto) - - ### Subsequently clicking into the TurtleScreen will - ### make the turtle move to the clicked point. + Example (for a TurtleScreen instance named screen) + + >>> screen.onclick(goto) + >>> # Subsequently clicking into the TurtleScreen will + >>> # make the turtle move to the clicked point. >>> screen.onclick(None) - - ### event-binding will be removed """ self._onscreenclick(fun, btn, add) @@ -1370,20 +1366,18 @@ In order to be able to register key-events, TurtleScreen must have focus. (See method listen.) - Example (for a TurtleScreen instance named screen - and a Turtle instance named turtle): + Example (for a TurtleScreen instance named screen): >>> def f(): - fd(50) - lt(60) - - + ... fd(50) + ... lt(60) + ... >>> screen.onkey(f, "Up") >>> screen.listen() - ### Subsequently the turtle can be moved by - ### repeatedly pressing the up-arrow key, - ### consequently drawing a hexagon + Subsequently the turtle can be moved by repeatedly pressing + the up-arrow key, consequently drawing a hexagon + """ if fun is None: if key in self._keys: @@ -1407,16 +1401,15 @@ and a Turtle instance named turtle): >>> def f(): - fd(50) - - - >>> screen.onkey(f, "Up") + ... fd(50) + ... lt(60) + ... + >>> screen.onkeypress(f, "Up") >>> screen.listen() - ### Subsequently the turtle can be moved by - ### repeatedly pressing the up-arrow key, - ### or by keeping pressed the up-arrow key. - ### consequently drawing a hexagon. + Subsequently the turtle can be moved by repeatedly pressing + the up-arrow key, or by keeping pressed the up-arrow key. + consequently drawing a hexagon. """ if fun is None: if key in self._keys: @@ -1448,12 +1441,12 @@ >>> running = True >>> def f(): - if running: - fd(50) - lt(60) - screen.ontimer(f, 250) - - >>> f() ### makes the turtle marching around + ... if running: + ... fd(50) + ... lt(60) + ... screen.ontimer(f, 250) + ... + >>> f() # makes the turtle marching around >>> running = False """ self._ontimer(fun, t) @@ -1497,7 +1490,7 @@ Example (for a Turtle instance named turtle): >>> turtle.screensize(2000,1500) - ### e. g. to search for an erroneously escaped turtle ;-) + >>> # e.g. to search for an erroneously escaped turtle ;-) """ return self._resize(canvwidth, canvheight, bg) @@ -2085,7 +2078,7 @@ Example (for a Turtle instance named turtle): >>> turtle.pensize() 1 - turtle.pensize(10) # from here on lines of width 10 are drawn + >>> turtle.pensize(10) # from here on lines of width 10 are drawn """ if width is None: return self._pensize @@ -2560,7 +2553,7 @@ """Delete the turtle's drawings and restore its default values. No argument. -, + Delete the turtle's drawings from the screen, re-center the turtle and set variables to the default values. @@ -2607,7 +2600,7 @@ Example (for a Turtle instance named turtle): >>> while undobufferentries(): - undo() + ... undo() """ if self.undobuffer is None: return 0 @@ -2683,9 +2676,9 @@ >>> turtle.tracer(8, 25) >>> dist = 2 >>> for i in range(200): - turtle.fd(dist) - turtle.rt(90) - dist += 2 + ... turtle.fd(dist) + ... turtle.rt(90) + ... dist += 2 """ return self.screen.tracer(flag, delay) @@ -2883,7 +2876,6 @@ >>> turtle.shapesize(5,2) >>> turtle.tilt(45) >>> turtle.tiltangle() - >>> """ if angle is None: tilt = -self._tilt * (180.0/math.pi) * self._angleOrient @@ -2928,7 +2920,7 @@ >>> turtle.shapesize(4,2) >>> turtle.shearfactor(-0.5) >>> turtle.shapetransform() - >>> (4.0, -1.0, -0.0, 2.0) + (4.0, -1.0, -0.0, 2.0) """ if t11 is t12 is t21 is t22 is None: return self._shapetrafo @@ -3126,7 +3118,7 @@ Example (for a Turtle instance named turtle): >>> for i in range(8): - turtle.stamp(); turtle.fd(30) + ... turtle.stamp(); turtle.fd(30) ... >>> turtle.clearstamps(2) >>> turtle.clearstamps(-2) @@ -3302,9 +3294,9 @@ Example (for a Turtle instance named turtle): >>> turtle.begin_fill() >>> if turtle.filling(): - turtle.pensize(5) - else: - turtle.pensize(3) + ... turtle.pensize(5) + ... else: + ... turtle.pensize(3) """ return isinstance(self._fillpath, list) @@ -3534,9 +3526,9 @@ Example for the anonymous turtle, i. e. the procedural way: >>> def turn(x, y): - left(360) - - >>> onclick(turn) # Now clicking into the turtle will turn it. + ... left(360) + ... + >>> onclick(turn) # Now clicking into the turtle will turn it. >>> onclick(None) # event-binding will be removed """ self.screen._onclick(self.turtle._item, fun, btn, add) @@ -3552,16 +3544,17 @@ Example (for a MyTurtle instance named joe): >>> class MyTurtle(Turtle): - def glow(self,x,y): - self.fillcolor("red") - def unglow(self,x,y): - self.fillcolor("") - + ... def glow(self,x,y): + ... self.fillcolor("red") + ... def unglow(self,x,y): + ... self.fillcolor("") + ... >>> joe = MyTurtle() >>> joe.onclick(joe.glow) >>> joe.onrelease(joe.unglow) - ### clicking on joe turns fillcolor red, - ### unclicking turns it to transparent. + + Clicking on joe turns fillcolor red, unclicking turns it to + transparent. """ self.screen._onrelease(self.turtle._item, fun, btn, add) self._update() @@ -3580,9 +3573,9 @@ Example (for a Turtle instance named turtle): >>> turtle.ondrag(turtle.goto) - ### Subsequently clicking and dragging a Turtle will - ### move it across the screen thereby producing handdrawings - ### (if pen is down). + Subsequently clicking and dragging a Turtle will move it + across the screen thereby producing handdrawings (if pen is + down). """ self.screen._ondrag(self.turtle._item, fun, btn, add) @@ -3630,10 +3623,11 @@ Example (for a Turtle instance named turtle): >>> for i in range(4): - turtle.fd(50); turtle.lt(80) - + ... turtle.fd(50); turtle.lt(80) + ... >>> for i in range(8): - turtle.undo() + ... turtle.undo() + ... """ if self.undobuffer is None: return diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -87,6 +87,8 @@ Library ------- +- Issue #13439: Fix many errors in turtle docstrings. + - Issue #13487: Make inspect.getmodule robust against changes done to sys.modules while it is iterating over it. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #13439: Fix many errors in turtle docstrings.
by petri.lehtinen Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/cpython/rev/6e03ab9950f6 changeset: 73815:6e03ab9950f6 branch: 2.7 parent: 73812:2f9c986b46cd user: Petri Lehtinen <petri(a)digip.org> date: Fri Dec 02 21:09:30 2011 +0200 summary: Issue #13439: Fix many errors in turtle docstrings. files: Lib/lib-tk/turtle.py | 104 ++++++++++++++---------------- Misc/NEWS | 2 + 2 files changed, 52 insertions(+), 54 deletions(-) diff --git a/Lib/lib-tk/turtle.py b/Lib/lib-tk/turtle.py --- a/Lib/lib-tk/turtle.py +++ b/Lib/lib-tk/turtle.py @@ -859,7 +859,7 @@ >>> poly = ((0,0),(10,-5),(0,10),(-10,-5)) >>> s = Shape("compound") >>> s.addcomponent(poly, "red", "blue") - ### .. add more components and then use register_shape() + >>> # .. add more components and then use register_shape() """ if self._type != "compound": raise TurtleGraphicsError("Cannot add component to %s Shape" @@ -958,7 +958,7 @@ No argument. Example (for a TurtleScreen instance named screen): - screen.clear() + >>> screen.clear() Note: this method is not available as function. """ @@ -1030,8 +1030,8 @@ Example (for a TurtleScreen instance named screen): >>> screen.setworldcoordinates(-10,-0.5,50,1.5) >>> for _ in range(36): - left(10) - forward(0.5) + ... left(10) + ... forward(0.5) """ if self.mode() != "world": self.mode("world") @@ -1136,7 +1136,7 @@ >>> screen.colormode() 1.0 >>> screen.colormode(255) - >>> turtle.pencolor(240,160,80) + >>> pencolor(240,160,80) """ if cmode is None: return self._colormode @@ -1204,9 +1204,9 @@ >>> screen.tracer(8, 25) >>> dist = 2 >>> for i in range(200): - fd(dist) - rt(90) - dist += 2 + ... fd(dist) + ... rt(90) + ... dist += 2 """ if n is None: return self._tracing @@ -1233,7 +1233,7 @@ self._delayvalue = int(delay) def _incrementudc(self): - "Increment upadate counter.""" + """Increment upadate counter.""" if not TurtleScreen._RUNNING: TurtleScreen._RUNNNING = True raise Terminator @@ -1304,13 +1304,10 @@ Example (for a TurtleScreen instance named screen and a Turtle instance named turtle): - >>> screen.onclick(turtle.goto) - - ### Subsequently clicking into the TurtleScreen will - ### make the turtle move to the clicked point. + >>> screen.onclick(goto) + >>> # Subsequently clicking into the TurtleScreen will + >>> # make the turtle move to the clicked point. >>> screen.onclick(None) - - ### event-binding will be removed """ self._onscreenclick(fun, btn, add) @@ -1324,20 +1321,18 @@ In order to be able to register key-events, TurtleScreen must have focus. (See method listen.) - Example (for a TurtleScreen instance named screen - and a Turtle instance named turtle): + Example (for a TurtleScreen instance named screen): >>> def f(): - fd(50) - lt(60) - - + ... fd(50) + ... lt(60) + ... >>> screen.onkey(f, "Up") >>> screen.listen() - ### Subsequently the turtle can be moved by - ### repeatedly pressing the up-arrow key, - ### consequently drawing a hexagon + Subsequently the turtle can be moved by repeatedly pressing + the up-arrow key, consequently drawing a hexagon + """ if fun is None: if key in self._keys: @@ -1369,12 +1364,12 @@ >>> running = True >>> def f(): - if running: - fd(50) - lt(60) - screen.ontimer(f, 250) - - >>> f() ### makes the turtle marching around + ... if running: + ... fd(50) + ... lt(60) + ... screen.ontimer(f, 250) + ... + >>> f() # makes the turtle marching around >>> running = False """ self._ontimer(fun, t) @@ -1418,7 +1413,7 @@ Example (for a Turtle instance named turtle): >>> turtle.screensize(2000,1500) - ### e. g. to search for an erroneously escaped turtle ;-) + >>> # e. g. to search for an erroneously escaped turtle ;-) """ return self._resize(canvwidth, canvheight, bg) @@ -2004,7 +1999,7 @@ Example (for a Turtle instance named turtle): >>> turtle.pensize() 1 - turtle.pensize(10) # from here on lines of width 10 are drawn + >>> turtle.pensize(10) # from here on lines of width 10 are drawn """ if width is None: return self._pensize @@ -2516,7 +2511,7 @@ Example (for a Turtle instance named turtle): >>> while undobufferentries(): - undo() + ... undo() """ if self.undobuffer is None: return 0 @@ -2592,9 +2587,9 @@ >>> turtle.tracer(8, 25) >>> dist = 2 >>> for i in range(200): - turtle.fd(dist) - turtle.rt(90) - dist += 2 + ... turtle.fd(dist) + ... turtle.rt(90) + ... dist += 2 """ return self.screen.tracer(flag, delay) @@ -2763,7 +2758,6 @@ >>> turtle.shapesize(5,2) >>> turtle.tilt(45) >>> turtle.tiltangle() - >>> """ tilt = -self._tilt * (180.0/math.pi) * self._angleOrient return (tilt / self._degreesPerAU) % self._fullcircle @@ -2963,7 +2957,7 @@ Example (for a Turtle instance named turtle): >>> for i in range(8): - turtle.stamp(); turtle.fd(30) + ... turtle.stamp(); turtle.fd(30) ... >>> turtle.clearstamps(2) >>> turtle.clearstamps(-2) @@ -3430,9 +3424,9 @@ Example for the anonymous turtle, i. e. the procedural way: >>> def turn(x, y): - left(360) - - >>> onclick(turn) # Now clicking into the turtle will turn it. + ... left(360) + ... + >>> onclick(turn) # Now clicking into the turtle will turn it. >>> onclick(None) # event-binding will be removed """ self.screen._onclick(self.turtle._item, fun, btn, add) @@ -3448,16 +3442,17 @@ Example (for a MyTurtle instance named joe): >>> class MyTurtle(Turtle): - def glow(self,x,y): - self.fillcolor("red") - def unglow(self,x,y): - self.fillcolor("") - + ... def glow(self,x,y): + ... self.fillcolor("red") + ... def unglow(self,x,y): + ... self.fillcolor("") + ... >>> joe = MyTurtle() >>> joe.onclick(joe.glow) >>> joe.onrelease(joe.unglow) - ### clicking on joe turns fillcolor red, - ### unclicking turns it to transparent. + + Clicking on joe turns fillcolor red, unclicking turns it to + transparent. """ self.screen._onrelease(self.turtle._item, fun, btn, add) self._update() @@ -3476,9 +3471,9 @@ Example (for a Turtle instance named turtle): >>> turtle.ondrag(turtle.goto) - ### Subsequently clicking and dragging a Turtle will - ### move it across the screen thereby producing handdrawings - ### (if pen is down). + Subsequently clicking and dragging a Turtle will move it + across the screen thereby producing handdrawings (if pen is + down). """ self.screen._ondrag(self.turtle._item, fun, btn, add) @@ -3525,10 +3520,11 @@ Example (for a Turtle instance named turtle): >>> for i in range(4): - turtle.fd(50); turtle.lt(80) - + ... turtle.fd(50); turtle.lt(80) + ... >>> for i in range(8): - turtle.undo() + ... turtle.undo() + ... """ if self.undobuffer is None: return diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -79,6 +79,8 @@ Library ------- +- Issue #13439: Fix many errors in turtle docstrings. + - Issue #12856: Ensure child processes do not inherit the parent's random seed for filename generation in the tempfile module. Patch by Brian Harring. -- Repository URL: http://hg.python.org/cpython

1 0

peps: Mark PEP 3155 final.
by antoine.pitrou Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/peps/rev/f41beb5dcdaa changeset: 4007:f41beb5dcdaa user: Antoine Pitrou <solipsis(a)pitrou.net> date: Fri Dec 02 20:20:06 2011 +0100 summary: Mark PEP 3155 final. files: pep-3155.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/pep-3155.txt b/pep-3155.txt --- a/pep-3155.txt +++ b/pep-3155.txt @@ -3,7 +3,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: Antoine Pitrou <solipsis(a)pitrou.net> -Status: Accepted +Status: Final Type: Standards Track Content-Type: text/x-rst Created: 2011-10-29 -- Repository URL: http://hg.python.org/peps

1 0

peps: Update PEP 3154 after PEP 3155 has been accepted.
by antoine.pitrou Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/peps/rev/d54015aaa32b changeset: 4006:d54015aaa32b user: Antoine Pitrou <solipsis(a)pitrou.net> date: Fri Dec 02 20:19:29 2011 +0100 summary: Update PEP 3154 after PEP 3155 has been accepted. files: pep-3154.txt | 37 ++++++++++++++++--------------------- 1 files changed, 16 insertions(+), 21 deletions(-) diff --git a/pep-3154.txt b/pep-3154.txt --- a/pep-3154.txt +++ b/pep-3154.txt @@ -71,27 +71,20 @@ special method (``__getnewargs_ex__`` ?) and a new opcode (NEWOBJEX ?) are needed. -Serializing more callable objects ---------------------------------- +Serializing more "lookupable" objects +------------------------------------- -Currently, only module-global functions are serializable. -Multiprocessing has custom support for pickling other callables such -as bound methods [4]_. This support could be folded in the protocol, -and made more efficient through a new GETATTR opcode. +For some kinds of objects, it only makes sense to serialize them by name +(for example classes and functions). By default, pickle is only able to +serialize module-global functions and classes by name. Supporting other +kinds of objects, such as unbound methods [4]_, is a common request. +Actually, third-party support for some of them, such as bound methods, +is implemented in the multiprocessing module [5]_. -Serializing "pseudo-global" objects ------------------------------------ - -Objects which are not module-global, but should be treated in a -similar fashion -- such as unbound methods [5]_ or nested classes -- -cannot currently be pickled (or, rather, unpickled) because the pickle -protocol does not correctly specify how to retrieve them. One -solution would be through the adjunction of a ``__namespace__`` (or -``__qualname__``) to all class and function objects, specifying the -full "path" by which they can be retrieved. For globals, this would -generally be ``"{}.{}".format(obj.__module__, obj.__name__)``. Then a -new opcode can resolve that path and push the object on the stack, -similarly to the GLOBAL opcode. +:pep:`3155` now makes it possible to lookup many more objects by name. +Generalizing the GLOBAL opcode to accept dot-separated names, or adding +a special GETATTR opcode, would allow the standard pickle implementation +to support, in an efficient way, all those kinds of objects. Binary encoding for all opcodes ------------------------------- @@ -131,12 +124,12 @@ .. [3] "pickle/copyreg doesn't support keyword only arguments in __new__": http://bugs.python.org/issue4727 -.. [4] Lib/multiprocessing/forking.py: +.. [4] "pickle should support methods": + http://bugs.python.org/issue9276 + +.. [5] Lib/multiprocessing/forking.py: http://hg.python.org/cpython/file/baea9f5f973c/Lib/multiprocessing/forking.… -.. [5] "pickle should support methods": - http://bugs.python.org/issue9276 - Copyright ========= -- Repository URL: http://hg.python.org/peps

1 0

cpython (merge 3.2 -> default): #13494: merge with 3.2.
by ezio.melotti Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/cpython/rev/454b97887c5a changeset: 73814:454b97887c5a parent: 73811:060c7093a81f parent: 73813:69369fd3514b user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Fri Dec 02 19:49:02 2011 +0200 summary: #13494: merge with 3.2. files: Doc/library/stdtypes.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2772,9 +2772,9 @@ used to represent truth values (although other values can also be considered false or true). In numeric contexts (for example when used as the argument to an arithmetic operator), they behave like the integers 0 and 1, respectively. -The built-in function :func:`bool` can be used to cast any value to a Boolean, -if the value can be interpreted as a truth value (see section Truth Value -Testing above). +The built-in function :func:`bool` can be used to convert any value to a +Boolean, if the value can be interpreted as a truth value (see section +:ref:`truth` above). .. index:: single: False -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): #13494: s/cast/convert/. Also add a link.
by ezio.melotti Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/cpython/rev/69369fd3514b changeset: 73813:69369fd3514b branch: 3.2 parent: 73810:9e7728dc35e7 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Fri Dec 02 19:47:24 2011 +0200 summary: #13494: s/cast/convert/. Also add a link. files: Doc/library/stdtypes.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2736,9 +2736,9 @@ used to represent truth values (although other values can also be considered false or true). In numeric contexts (for example when used as the argument to an arithmetic operator), they behave like the integers 0 and 1, respectively. -The built-in function :func:`bool` can be used to cast any value to a Boolean, -if the value can be interpreted as a truth value (see section Truth Value -Testing above). +The built-in function :func:`bool` can be used to convert any value to a +Boolean, if the value can be interpreted as a truth value (see section +:ref:`truth` above). .. index:: single: False -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #13494: s/cast/convert/. Also add a link.
by ezio.melotti Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/cpython/rev/2f9c986b46cd changeset: 73812:2f9c986b46cd branch: 2.7 parent: 73809:d9e918c8d9d6 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Fri Dec 02 19:47:24 2011 +0200 summary: #13494: s/cast/convert/. Also add a link. files: Doc/library/stdtypes.rst | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -2955,9 +2955,9 @@ used to represent truth values (although other values can also be considered false or true). In numeric contexts (for example when used as the argument to an arithmetic operator), they behave like the integers 0 and 1, respectively. -The built-in function :func:`bool` can be used to cast any value to a Boolean, -if the value can be interpreted as a truth value (see section Truth Value -Testing above). +The built-in function :func:`bool` can be used to convert any value to a +Boolean, if the value can be interpreted as a truth value (see section +:ref:`truth` above). .. index:: single: False -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): #13499: merge with 3.2.
by ezio.melotti Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/cpython/rev/060c7093a81f changeset: 73811:060c7093a81f parent: 73808:47afbb2033aa parent: 73810:9e7728dc35e7 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Fri Dec 02 19:29:10 2011 +0200 summary: #13499: merge with 3.2. files: Doc/library/uuid.rst | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Doc/library/uuid.rst b/Doc/library/uuid.rst --- a/Doc/library/uuid.rst +++ b/Doc/library/uuid.rst @@ -222,34 +222,34 @@ >>> import uuid - # make a UUID based on the host ID and current time + >>> # make a UUID based on the host ID and current time >>> uuid.uuid1() UUID('a8098c1a-f86e-11da-bd1a-00112444be1e') - # make a UUID using an MD5 hash of a namespace UUID and a name + >>> # make a UUID using an MD5 hash of a namespace UUID and a name >>> uuid.uuid3(uuid.NAMESPACE_DNS, 'python.org') UUID('6fa459ea-ee8a-3ca4-894e-db77e160355e') - # make a random UUID + >>> # make a random UUID >>> uuid.uuid4() UUID('16fd2706-8baf-433b-82eb-8c7fada847da') - # make a UUID using a SHA-1 hash of a namespace UUID and a name + >>> # make a UUID using a SHA-1 hash of a namespace UUID and a name >>> uuid.uuid5(uuid.NAMESPACE_DNS, 'python.org') UUID('886313e1-3b8a-5372-9b90-0c9aee199e5d') - # make a UUID from a string of hex digits (braces and hyphens ignored) + >>> # make a UUID from a string of hex digits (braces and hyphens ignored) >>> x = uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}') - # convert a UUID to a string of hex digits in standard form + >>> # convert a UUID to a string of hex digits in standard form >>> str(x) '00010203-0405-0607-0809-0a0b0c0d0e0f' - # get the raw 16 bytes of the UUID + >>> # get the raw 16 bytes of the UUID >>> x.bytes b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f' - # make a UUID from a 16-byte string + >>> # make a UUID from a 16-byte string >>> uuid.UUID(bytes=x.bytes) UUID('00010203-0405-0607-0809-0a0b0c0d0e0f') -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): #13499: fix example adding >>> before the comments.
by ezio.melotti Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/cpython/rev/9e7728dc35e7 changeset: 73810:9e7728dc35e7 branch: 3.2 parent: 73807:1efefeda00a7 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Fri Dec 02 19:28:36 2011 +0200 summary: #13499: fix example adding >>> before the comments. files: Doc/library/uuid.rst | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Doc/library/uuid.rst b/Doc/library/uuid.rst --- a/Doc/library/uuid.rst +++ b/Doc/library/uuid.rst @@ -222,34 +222,34 @@ >>> import uuid - # make a UUID based on the host ID and current time + >>> # make a UUID based on the host ID and current time >>> uuid.uuid1() UUID('a8098c1a-f86e-11da-bd1a-00112444be1e') - # make a UUID using an MD5 hash of a namespace UUID and a name + >>> # make a UUID using an MD5 hash of a namespace UUID and a name >>> uuid.uuid3(uuid.NAMESPACE_DNS, 'python.org') UUID('6fa459ea-ee8a-3ca4-894e-db77e160355e') - # make a random UUID + >>> # make a random UUID >>> uuid.uuid4() UUID('16fd2706-8baf-433b-82eb-8c7fada847da') - # make a UUID using a SHA-1 hash of a namespace UUID and a name + >>> # make a UUID using a SHA-1 hash of a namespace UUID and a name >>> uuid.uuid5(uuid.NAMESPACE_DNS, 'python.org') UUID('886313e1-3b8a-5372-9b90-0c9aee199e5d') - # make a UUID from a string of hex digits (braces and hyphens ignored) + >>> # make a UUID from a string of hex digits (braces and hyphens ignored) >>> x = uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}') - # convert a UUID to a string of hex digits in standard form + >>> # convert a UUID to a string of hex digits in standard form >>> str(x) '00010203-0405-0607-0809-0a0b0c0d0e0f' - # get the raw 16 bytes of the UUID + >>> # get the raw 16 bytes of the UUID >>> x.bytes b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f' - # make a UUID from a 16-byte string + >>> # make a UUID from a 16-byte string >>> uuid.UUID(bytes=x.bytes) UUID('00010203-0405-0607-0809-0a0b0c0d0e0f') -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #13499: fix example adding >>> before the comments.
by ezio.melotti Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/cpython/rev/d9e918c8d9d6 changeset: 73809:d9e918c8d9d6 branch: 2.7 parent: 73806:bcfb499338c1 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Fri Dec 02 19:26:48 2011 +0200 summary: #13499: fix example adding >>> before the comments. files: Doc/library/uuid.rst | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Doc/library/uuid.rst b/Doc/library/uuid.rst --- a/Doc/library/uuid.rst +++ b/Doc/library/uuid.rst @@ -225,34 +225,34 @@ >>> import uuid - # make a UUID based on the host ID and current time + >>> # make a UUID based on the host ID and current time >>> uuid.uuid1() UUID('a8098c1a-f86e-11da-bd1a-00112444be1e') - # make a UUID using an MD5 hash of a namespace UUID and a name + >>> # make a UUID using an MD5 hash of a namespace UUID and a name >>> uuid.uuid3(uuid.NAMESPACE_DNS, 'python.org') UUID('6fa459ea-ee8a-3ca4-894e-db77e160355e') - # make a random UUID + >>> # make a random UUID >>> uuid.uuid4() UUID('16fd2706-8baf-433b-82eb-8c7fada847da') - # make a UUID using a SHA-1 hash of a namespace UUID and a name + >>> # make a UUID using a SHA-1 hash of a namespace UUID and a name >>> uuid.uuid5(uuid.NAMESPACE_DNS, 'python.org') UUID('886313e1-3b8a-5372-9b90-0c9aee199e5d') - # make a UUID from a string of hex digits (braces and hyphens ignored) + >>> # make a UUID from a string of hex digits (braces and hyphens ignored) >>> x = uuid.UUID('{00010203-0405-0607-0809-0a0b0c0d0e0f}') - # convert a UUID to a string of hex digits in standard form + >>> # convert a UUID to a string of hex digits in standard form >>> str(x) '00010203-0405-0607-0809-0a0b0c0d0e0f' - # get the raw 16 bytes of the UUID + >>> # get the raw 16 bytes of the UUID >>> x.bytes '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f' - # make a UUID from a 16-byte string + >>> # make a UUID from a 16-byte string >>> uuid.UUID(bytes=x.bytes) UUID('00010203-0405-0607-0809-0a0b0c0d0e0f') -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): #8414: merge with 3.2.
by ezio.melotti Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/cpython/rev/47afbb2033aa changeset: 73808:47afbb2033aa parent: 73805:7e37598a25a6 parent: 73807:1efefeda00a7 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Fri Dec 02 18:23:54 2011 +0200 summary: #8414: merge with 3.2. files: Lib/test/test_grammar.py | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py --- a/Lib/test/test_grammar.py +++ b/Lib/test/test_grammar.py @@ -500,13 +500,35 @@ assert 1, 1 assert lambda x:x assert 1, lambda x:x+1 + + try: + assert True + except AssertionError as e: + self.fail("'assert True' should not have raised an AssertionError") + + try: + assert True, 'this should always pass' + except AssertionError as e: + self.fail("'assert True, msg' should not have " + "raised an AssertionError") + + # these tests fail if python is run with -O, so check __debug__ + @unittest.skipUnless(__debug__, "Won't work if __debug__ is False") + def testAssert2(self): try: assert 0, "msg" except AssertionError as e: self.assertEqual(e.args[0], "msg") else: - if __debug__: - self.fail("AssertionError not raised by assert 0") + self.fail("AssertionError not raised by assert 0") + + try: + assert False + except AssertionError as e: + self.assertEqual(len(e.args), 0) + else: + self.fail("AssertionError not raised by 'assert False'") + ### compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef # Tested below -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): #8414: add more tests for "assert". Initial patch by Gregory Nofi.
by ezio.melotti Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/cpython/rev/1efefeda00a7 changeset: 73807:1efefeda00a7 branch: 3.2 parent: 73796:2c05b8a6cdd1 user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Fri Dec 02 18:22:52 2011 +0200 summary: #8414: add more tests for "assert". Initial patch by Gregory Nofi. files: Lib/test/test_grammar.py | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py --- a/Lib/test/test_grammar.py +++ b/Lib/test/test_grammar.py @@ -493,13 +493,35 @@ assert 1, 1 assert lambda x:x assert 1, lambda x:x+1 + + try: + assert True + except AssertionError as e: + self.fail("'assert True' should not have raised an AssertionError") + + try: + assert True, 'this should always pass' + except AssertionError as e: + self.fail("'assert True, msg' should not have " + "raised an AssertionError") + + # these tests fail if python is run with -O, so check __debug__ + @unittest.skipUnless(__debug__, "Won't work if __debug__ is False") + def testAssert2(self): try: assert 0, "msg" except AssertionError as e: self.assertEqual(e.args[0], "msg") else: - if __debug__: - self.fail("AssertionError not raised by assert 0") + self.fail("AssertionError not raised by assert 0") + + try: + assert False + except AssertionError as e: + self.assertEqual(len(e.args), 0) + else: + self.fail("AssertionError not raised by 'assert False'") + ### compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef # Tested below -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): #8414: add more tests for "assert". Initial patch by Gregory Nofi.
by ezio.melotti Dec. 2, 2011

Dec. 2, 2011

http://hg.python.org/cpython/rev/bcfb499338c1 changeset: 73806:bcfb499338c1 branch: 2.7 parent: 73783:3ecddf168f1f user: Ezio Melotti <ezio.melotti(a)gmail.com> date: Fri Dec 02 18:17:30 2011 +0200 summary: #8414: add more tests for "assert". Initial patch by Gregory Nofi. files: Lib/test/test_grammar.py | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py --- a/Lib/test/test_grammar.py +++ b/Lib/test/test_grammar.py @@ -551,13 +551,35 @@ assert 1, 1 assert lambda x:x assert 1, lambda x:x+1 + + try: + assert True + except AssertionError as e: + self.fail("'assert True' should not have raised an AssertionError") + + try: + assert True, 'this should always pass' + except AssertionError as e: + self.fail("'assert True, msg' should not have " + "raised an AssertionError") + + # these tests fail if python is run with -O, so check __debug__ + @unittest.skipUnless(__debug__, "Won't work if __debug__ is False") + def testAssert2(self): try: assert 0, "msg" except AssertionError, e: self.assertEqual(e.args[0], "msg") else: - if __debug__: - self.fail("AssertionError not raised by assert 0") + self.fail("AssertionError not raised by assert 0") + + try: + assert False + except AssertionError as e: + self.assertEqual(len(e.args), 0) + else: + self.fail("AssertionError not raised by 'assert False'") + ### compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef # Tested below -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (7e37598a25a6): sum=0
by solipsis＠pitrou.net Dec. 1, 2011

Dec. 1, 2011

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

1 0

cpython: Issue #9530: Fix undefined behaviour due to signed overflow in
by mark.dickinson Dec. 1, 2011

Dec. 1, 2011

http://hg.python.org/cpython/rev/7e37598a25a6 changeset: 73805:7e37598a25a6 user: Mark Dickinson <mdickinson(a)enthought.com> date: Thu Dec 01 15:27:04 2011 +0000 summary: Issue #9530: Fix undefined behaviour due to signed overflow in Python/formatter_unicode.c. files: Python/formatter_unicode.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-) diff --git a/Python/formatter_unicode.c b/Python/formatter_unicode.c --- a/Python/formatter_unicode.c +++ b/Python/formatter_unicode.c @@ -51,7 +51,7 @@ get_integer(PyObject *str, Py_ssize_t *pos, Py_ssize_t end, Py_ssize_t *result) { - Py_ssize_t accumulator, digitval, oldaccumulator; + Py_ssize_t accumulator, digitval; int numdigits; accumulator = numdigits = 0; for (;;(*pos)++, numdigits++) { @@ -61,19 +61,17 @@ if (digitval < 0) break; /* - This trick was copied from old Unicode format code. It's cute, - but would really suck on an old machine with a slow divide - implementation. Fortunately, in the normal case we do not - expect too many digits. + Detect possible overflow before it happens: + + accumulator * 10 + digitval > PY_SSIZE_T_MAX if and only if + accumulator > (PY_SSIZE_T_MAX - digitval) / 10. */ - oldaccumulator = accumulator; - accumulator *= 10; - if ((accumulator+10)/10 != oldaccumulator+1) { + if (accumulator > (PY_SSIZE_T_MAX - digitval) / 10) { PyErr_Format(PyExc_ValueError, "Too many decimal digits in format string"); return -1; } - accumulator += digitval; + accumulator = accumulator * 10 + digitval; } *result = accumulator; return numdigits; -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (0d1536ec44e8): sum=0
by solipsis＠pitrou.net Nov. 30, 2011

Nov. 30, 2011

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

1 0

cpython: Fix PyObject_Repr(): don't call PyUnicode_READY() if res is NULL
by victor.stinner Nov. 30, 2011

Nov. 30, 2011

http://hg.python.org/cpython/rev/0d1536ec44e8 changeset: 73804:0d1536ec44e8 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Dec 01 03:22:44 2011 +0100 summary: Fix PyObject_Repr(): don't call PyUnicode_READY() if res is NULL files: Objects/object.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -378,7 +378,9 @@ return PyUnicode_FromFormat("<%s object at %p>", v->ob_type->tp_name, v); res = (*v->ob_type->tp_repr)(v); - if (res != NULL && !PyUnicode_Check(res)) { + if (res == NULL) + return NULL; + if (!PyUnicode_Check(res)) { PyErr_Format(PyExc_TypeError, "__repr__ returned non-string (type %.200s)", res->ob_type->tp_name); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Replace PyUnicode_FromUnicode(NULL, 0) by PyUnicode_New(0, 0)
by victor.stinner Nov. 30, 2011

Nov. 30, 2011

http://hg.python.org/cpython/rev/d855329d0f72 changeset: 73803:d855329d0f72 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Dec 01 03:18:59 2011 +0100 summary: Replace PyUnicode_FromUnicode(NULL, 0) by PyUnicode_New(0, 0) Create an empty string with the new Unicode API. files: Modules/cjkcodecs/multibytecodec.c | 4 ++-- Objects/stringlib/unicode_format.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -633,7 +633,7 @@ if (datalen == 0) { PyBuffer_Release(&pdata); ERROR_DECREF(errorcb); - return make_tuple(PyUnicode_FromUnicode(NULL, 0), 0); + return make_tuple(PyUnicode_New(0, 0), 0); } buf.excobj = NULL; @@ -1265,7 +1265,7 @@ Py_ssize_t rsize, finalsize = 0; if (sizehint == 0) - return PyUnicode_FromUnicode(NULL, 0); + return PyUnicode_New(0, 0); buf.outobj = buf.excobj = NULL; cres = NULL; diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h --- a/Objects/stringlib/unicode_format.h +++ b/Objects/stringlib/unicode_format.h @@ -79,7 +79,7 @@ SubString_new_object_or_empty(SubString *str) { if (str->str == NULL) { - return PyUnicode_FromUnicode(NULL, 0); + return PyUnicode_New(0, 0); } return SubString_new_object(str); } -- Repository URL: http://hg.python.org/cpython

1 0

cpython: MultibyteCodec_Decode() catchs PyUnicode_AS_UNICODE() failures
by victor.stinner Nov. 30, 2011

Nov. 30, 2011

http://hg.python.org/cpython/rev/7216cf767993 changeset: 73802:7216cf767993 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Dec 01 03:18:30 2011 +0100 summary: MultibyteCodec_Decode() catchs PyUnicode_AS_UNICODE() failures files: Modules/cjkcodecs/multibytecodec.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c --- a/Modules/cjkcodecs/multibytecodec.c +++ b/Modules/cjkcodecs/multibytecodec.c @@ -643,6 +643,8 @@ if (buf.outobj == NULL) goto errorexit; buf.outbuf = PyUnicode_AS_UNICODE(buf.outobj); + if (buf.outbuf == NULL) + goto errorexit; buf.outbuf_end = buf.outbuf + PyUnicode_GET_SIZE(buf.outobj); if (self->codec->decinit != NULL && -- Repository URL: http://hg.python.org/cpython

1 0

cpython: PyCodec_IgnoreErrors() avoids the deprecated "u#" format
by victor.stinner Nov. 30, 2011

Nov. 30, 2011

http://hg.python.org/cpython/rev/6407294eb3c6 changeset: 73800:6407294eb3c6 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Dec 01 02:52:11 2011 +0100 summary: PyCodec_IgnoreErrors() avoids the deprecated "u#" format files: Python/codecs.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/Python/codecs.c b/Python/codecs.c --- a/Python/codecs.c +++ b/Python/codecs.c @@ -510,8 +510,7 @@ wrong_exception_type(exc); return NULL; } - /* ouch: passing NULL, 0, pos gives None instead of u'' */ - return Py_BuildValue("(u#n)", &end, 0, end); + return Py_BuildValue("(Nn)", PyUnicode_New(0, 0), end); } -- Repository URL: http://hg.python.org/cpython

1 0

cpython: c-api: Replace PyUnicodeObject* by PyObject* in "U" format doc
by victor.stinner Nov. 30, 2011

Nov. 30, 2011

http://hg.python.org/cpython/rev/ba8e7886fdd7 changeset: 73801:ba8e7886fdd7 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Dec 01 02:52:55 2011 +0100 summary: c-api: Replace PyUnicodeObject* by PyObject* in "U" format doc files: Doc/c-api/arg.rst | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -146,7 +146,7 @@ Like ``u#``, but the Python object may also be ``None``, in which case the :c:type:`Py_UNICODE` pointer is set to *NULL*. -``U`` (:class:`str`) [PyUnicodeObject \*] +``U`` (:class:`str`) [PyObject \*] Requires that the Python object is a Unicode object, without attempting any conversion. Raises :exc:`TypeError` if the object is not a Unicode object. The C variable may also be declared as :c:type:`PyObject\*`. -- Repository URL: http://hg.python.org/cpython

1 0

cpython: PyObject_Repr() ensures that the result is a ready Unicode string
by victor.stinner Nov. 30, 2011

Nov. 30, 2011

http://hg.python.org/cpython/rev/c5d2ce38b0d3 changeset: 73799:c5d2ce38b0d3 user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Thu Dec 01 02:15:00 2011 +0100 summary: PyObject_Repr() ensures that the result is a ready Unicode string And PyObject_Str() and PyObject_Repr() don't make strings ready in debug mode to ensure that the caller makes the string ready before using it. files: Objects/object.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/Objects/object.c b/Objects/object.c --- a/Objects/object.c +++ b/Objects/object.c @@ -385,6 +385,10 @@ Py_DECREF(res); return NULL; } +#ifndef Py_DEBUG + if (PyUnicode_READY(res) < 0) + return NULL; +#endif return res; } @@ -403,8 +407,10 @@ if (v == NULL) return PyUnicode_FromString("<NULL>"); if (PyUnicode_CheckExact(v)) { +#ifndef Py_DEBUG if (PyUnicode_READY(v) < 0) return NULL; +#endif Py_INCREF(v); return v; } @@ -426,8 +432,10 @@ Py_DECREF(res); return NULL; } +#ifndef Py_DEBUG if (PyUnicode_READY(res) < 0) return NULL; +#endif assert(_PyUnicode_CheckConsistency(res, 1)); return res; } -- Repository URL: http://hg.python.org/cpython

1 0