Mailing List Archive: Python: Checkins

cpython (merge 3.2 -> default): merge with 3.2

Index | Next | Previous | View Threaded

python-checkins at python

Aug 4, 2012, 10:43 AM

Post #1 of 13 (162 views)
Permalink

cpython (merge 3.2 -> default): merge with 3.2

http://hg.python.org/cpython/rev/fa8f6c680c6b
changeset: 78414:fa8f6c680c6b
parent: 78411:27ae40361ca5
parent: 78413:66b53f555704
user: Sandro Tosi <sandro.tosi [at] gmail>
date: Sat Aug 04 19:42:46 2012 +0200
summary:
merge with 3.2

files:
Doc/tutorial/modules.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst
--- a/Doc/tutorial/modules.rst
+++ b/Doc/tutorial/modules.rst
@@ -248,7 +248,7 @@
are not part of the core of the language but are nevertheless built in, either
for efficiency or to provide access to operating system primitives such as
system calls. The set of such modules is a configuration option which also
-depends on the underlying platform For example, the :mod:`winreg` module is only
+depends on the underlying platform. For example, the :mod:`winreg` module is only
provided on Windows systems. One particular module deserves some attention:
:mod:`sys`, which is built into every Python interpreter. The variables
``sys.ps1`` and ``sys.ps2`` define the strings used as primary and secondary

--
Repository URL: http://hg.python.org/cpython

python-checkins at python

Aug 12, 2012, 1:25 AM

Post #2 of 13 (148 views)
Permalink

cpython (merge 3.2 -> default): merge with 3.2 [In reply to]

http://hg.python.org/cpython/rev/71e33d4e5b3a
changeset: 78513:71e33d4e5b3a
parent: 78511:34d5ec8a1019
parent: 78512:233673503217
user: Sandro Tosi <sandro.tosi [at] gmail>
date: Sun Aug 12 10:25:10 2012 +0200
summary:
merge with 3.2

files:
Doc/tutorial/datastructures.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/tutorial/datastructures.rst b/Doc/tutorial/datastructures.rst
--- a/Doc/tutorial/datastructures.rst
+++ b/Doc/tutorial/datastructures.rst
@@ -297,7 +297,7 @@
In the real world, you should prefer built-in functions to complex flow statements.
The :func:`zip` function would do a great job for this use case::

- >>> zip(*matrix)
+ >>> list(zip(*matrix))
[.(1, 5, 9), (2, 6, 10), (3, 7, 11), (4, 8, 12)]

See :ref:`tut-unpacking-arguments` for details on the asterisk in this line.

--
Repository URL: http://hg.python.org/cpython

python-checkins at python

Aug 12, 2012, 1:49 AM

Post #3 of 13 (148 views)
Permalink

cpython (merge 3.2 -> default): merge with 3.2 [In reply to]

http://hg.python.org/cpython/rev/bb7d1eabc57e
changeset: 78517:bb7d1eabc57e
parent: 78514:c5b1d716c4d1
parent: 78516:a790357c452f
user: Sandro Tosi <sandro.tosi [at] gmail>
date: Sun Aug 12 10:49:40 2012 +0200
summary:
merge with 3.2

files:
Doc/library/argparse.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/library/argparse.rst b/Doc/library/argparse.rst
--- a/Doc/library/argparse.rst
+++ b/Doc/library/argparse.rst
@@ -766,7 +766,7 @@

* ``values`` - The associated command-line arguments, with any type conversions
applied. (Type conversions are specified with the type_ keyword argument to
- :meth:`~ArgumentParser.add_argument`.
+ :meth:`~ArgumentParser.add_argument`.)

* ``option_string`` - The option string that was used to invoke this action.
The ``option_string`` argument is optional, and will be absent if the action

--
Repository URL: http://hg.python.org/cpython

python-checkins at python

Aug 12, 2012, 2:02 AM

Post #4 of 13 (148 views)
Permalink

cpython (merge 3.2 -> default): merge with 3.2 [In reply to]

http://hg.python.org/cpython/rev/508c9f9b701a
changeset: 78520:508c9f9b701a
parent: 78517:bb7d1eabc57e
parent: 78519:b2907d1e5341
user: Sandro Tosi <sandro.tosi [at] gmail>
date: Sun Aug 12 11:02:17 2012 +0200
summary:
merge with 3.2

files:
Doc/using/unix.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst
--- a/Doc/using/unix.rst
+++ b/Doc/using/unix.rst
@@ -141,7 +141,7 @@
* http://sourceforge.net/projects/python-mode

Geany is an excellent IDE with support for a lot of languages. For more
-information, read: http://geany.uvena.de/
+information, read: http://www.geany.org/

Komodo edit is another extremely good IDE. It also has support for a lot of
languages. For more information, read:

--
Repository URL: http://hg.python.org/cpython

python-checkins at python

Aug 12, 2012, 3:36 AM

Post #5 of 13 (147 views)
Permalink

cpython (merge 3.2 -> default): merge with 3.2 [In reply to]

http://hg.python.org/cpython/rev/770020baf8e2
changeset: 78523:770020baf8e2
parent: 78520:508c9f9b701a
parent: 78522:7346821faf68
user: Sandro Tosi <sandro.tosi [at] gmail>
date: Sun Aug 12 12:35:31 2012 +0200
summary:
merge with 3.2

files:
Doc/library/stdtypes.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1358,7 +1358,7 @@

For example, ``'ab c\n\nde fg\rkl\r\n'.splitlines()`` returns
``['ab c', '', 'de fg', 'kl']``, while the same call with ``splitlines(True)``
- returns ``['ab c\n', '\n, 'de fg\r', 'kl\r\n']``.
+ returns ``['ab c\n', '\n', 'de fg\r', 'kl\r\n']``.

Unlike :meth:`~str.split` when a delimiter string *sep* is given, this
method returns an empty list for the empty string, and a terminal line

--
Repository URL: http://hg.python.org/cpython

python-checkins at python

Aug 12, 2012, 6:12 AM

Post #6 of 13 (147 views)
Permalink

cpython (merge 3.2 -> default): merge with 3.2 [In reply to]

http://hg.python.org/cpython/rev/f3e5545cf40c
changeset: 78528:f3e5545cf40c
parent: 78525:90a559ce9151
parent: 78526:e87fb826c092
user: Sandro Tosi <sandro.tosi [at] gmail>
date: Sun Aug 12 15:12:32 2012 +0200
summary:
merge with 3.2

files:
Doc/library/random.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/library/random.rst b/Doc/library/random.rst
--- a/Doc/library/random.rst
+++ b/Doc/library/random.rst
@@ -80,7 +80,7 @@

*state* should have been obtained from a previous call to :func:`getstate`, and
:func:`setstate` restores the internal state of the generator to what it was at
- the time :func:`setstate` was called.
+ the time :func:`getstate` was called.

.. function:: getrandbits(k)

--
Repository URL: http://hg.python.org/cpython

python-checkins at python

Aug 12, 2012, 6:35 AM

Post #7 of 13 (147 views)
Permalink

cpython (merge 3.2 -> default): merge with 3.2 [In reply to]

http://hg.python.org/cpython/rev/0d9222f32510
changeset: 78530:0d9222f32510
parent: 78528:f3e5545cf40c
parent: 78529:5617c4a0c035
user: Sandro Tosi <sandro.tosi [at] gmail>
date: Sun Aug 12 15:35:43 2012 +0200
summary:
merge with 3.2

files:
Doc/library/smtpd.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/library/smtpd.rst b/Doc/library/smtpd.rst
--- a/Doc/library/smtpd.rst
+++ b/Doc/library/smtpd.rst
@@ -116,7 +116,7 @@
.. attribute:: received_lines

Holds a list of the line strings (decoded using UTF-8) received from
- the client. The lines have their "\r\n" line ending translated to "\n".
+ the client. The lines have their "\\r\\n" line ending translated to "\\n".

.. attribute:: smtp_state

--
Repository URL: http://hg.python.org/cpython

python-checkins at python

Aug 12, 2012, 8:34 AM

Post #8 of 13 (147 views)
Permalink

cpython (merge 3.2 -> default): merge with 3.2 [In reply to]

http://hg.python.org/cpython/rev/bae08aad33cf
changeset: 78534:bae08aad33cf
parent: 78531:04788fa08adc
parent: 78533:df4ace12e413
user: Sandro Tosi <sandro.tosi [at] gmail>
date: Sun Aug 12 17:34:13 2012 +0200
summary:
merge with 3.2

files:
Doc/library/webbrowser.rst | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Doc/library/webbrowser.rst b/Doc/library/webbrowser.rst
--- a/Doc/library/webbrowser.rst
+++ b/Doc/library/webbrowser.rst
@@ -36,7 +36,9 @@
module. It accepts an URL as the argument. It accepts the following optional
parameters: ``-n`` opens the URL in a new browser window, if possible;
``-t`` opens the URL in a new browser page ("tab"). The options are,
-naturally, mutually exclusive.
+naturally, mutually exclusive. Usage example::
+
+ python -m webbrowser -t "http://www.python.org"

The following exception is defined:

--
Repository URL: http://hg.python.org/cpython

python-checkins at python

Aug 14, 2012, 12:40 AM

Post #9 of 13 (139 views)
Permalink

cpython (merge 3.2 -> default): merge with 3.2 [In reply to]

http://hg.python.org/cpython/rev/891e3555ed3f
changeset: 78559:891e3555ed3f
parent: 78557:71918a3c89ef
parent: 78558:1c9f1c2bd840
user: Georg Brandl <georg [at] python>
date: Tue Aug 14 09:40:26 2012 +0200
summary:
merge with 3.2

files:
Doc/library/functions.rst | 27 ++++++++++++---------------
Doc/library/io.rst | 27 ++++++++++++---------------
2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -878,22 +878,19 @@
mode). It can be ``None``, ``''``, ``'\n'``, ``'\r'``, and ``'\r\n'``. It
works as follows:

- * When reading input from the stream, if *newline* is ``None``,
- universal newlines mode is enabled. Lines in the input can end
- in ``'\n'``, ``'\r'``, or ``'\r\n'``, and these are translated
- into ``'\n'`` before being returned to the caller. If it is
- ``''``, universal newline mode is enabled, but line endings are
- returned to the caller untranslated. If it has any of the other
- legal values, input lines are only terminated by the given
- string, and the line ending is returned to the caller
- untranslated.
+ * When reading input from the stream, if *newline* is ``None``, universal
+ newlines mode is enabled. Lines in the input can end in ``'\n'``,
+ ``'\r'``, or ``'\r\n'``, and these are translated into ``'\n'`` before
+ being returned to the caller. If it is ``''``, universal newline mode is
+ enabled, but line endings are returned to the caller untranslated. If it
+ has any of the other legal values, input lines are only terminated by the
+ given string, and the line ending is returned to the caller untranslated.

- * When writing output to the stream, if *newline* is ``None``, any
- ``'\n'`` characters written are translated to the system default
- line separator, :data:`os.linesep`. If *newline* is ``''`` or
- ``'\n'``, no translation takes place. If *newline* is any of the
- other legal values, any ``'\n'`` characters written are
- translated to the given string.
+ * When writing output to the stream, if *newline* is ``None``, any ``'\n'``
+ characters written are translated to the system default line separator,
+ :data:`os.linesep`. If *newline* is ``''`` or ``'\n'``, no translation
+ takes place. If *newline* is any of the other legal values, any ``'\n'``
+ characters written are translated to the given string.

If *closefd* is ``False`` and a file descriptor rather than a filename was
given, the underlying file descriptor will be kept open when the file is
diff --git a/Doc/library/io.rst b/Doc/library/io.rst
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -771,22 +771,19 @@
*newline* controls how line endings are handled. It can be ``None``,
``''``, ``'\n'``, ``'\r'``, and ``'\r\n'``. It works as follows:

- * When reading input from the stream, if *newline* is ``None``,
- universal newlines mode is enabled. Lines in the input can end
- in ``'\n'``, ``'\r'``, or ``'\r\n'``, and these are translated
- into ``'\n'`` before being returned to the caller. If it is
- ``''``, universal newline mode is enabled, but line endings are
- returned to the caller untranslated. If it has any of the other
- legal values, input lines are only terminated by the given
- string, and the line ending is returned to the caller
- untranslated.
+ * When reading input from the stream, if *newline* is ``None``, universal
+ newlines mode is enabled. Lines in the input can end in ``'\n'``,
+ ``'\r'``, or ``'\r\n'``, and these are translated into ``'\n'`` before
+ being returned to the caller. If it is ``''``, universal newline mode is
+ enabled, but line endings are returned to the caller untranslated. If it
+ has any of the other legal values, input lines are only terminated by the
+ given string, and the line ending is returned to the caller untranslated.

- * When writing output to the stream, if *newline* is ``None``, any
- ``'\n'`` characters written are translated to the system default
- line separator, :data:`os.linesep`. If *newline* is ``''`` or
- ``'\n'``, no translation takes place. If *newline* is any of the
- other legal values, any ``'\n'`` characters written are
- translated to the given string.
+ * When writing output to the stream, if *newline* is ``None``, any ``'\n'``
+ characters written are translated to the system default line separator,
+ :data:`os.linesep`. If *newline* is ``''`` or ``'\n'``, no translation
+ takes place. If *newline* is any of the other legal values, any ``'\n'``
+ characters written are translated to the given string.

If *line_buffering* is ``True``, :meth:`flush` is implied when a call to
write contains a newline character.

--
Repository URL: http://hg.python.org/cpython

python-checkins at python

Aug 14, 2012, 10:52 AM

Post #10 of 13 (140 views)
Permalink

cpython (merge 3.2 -> default): merge with 3.2 [In reply to]

http://hg.python.org/cpython/rev/ba9b35fb9c40
changeset: 78579:ba9b35fb9c40
parent: 78575:e2e85ed7f8ba
parent: 78578:7e56c46f5707
user: Sandro Tosi <sandro.tosi [at] gmail>
date: Tue Aug 14 19:52:04 2012 +0200
summary:
merge with 3.2

files:
Doc/tutorial/inputoutput.rst | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst
--- a/Doc/tutorial/inputoutput.rst
+++ b/Doc/tutorial/inputoutput.rst
@@ -37,7 +37,7 @@
The :func:`str` function is meant to return representations of values which are
fairly human-readable, while :func:`repr` is meant to generate representations
which can be read by the interpreter (or will force a :exc:`SyntaxError` if
-there is not equivalent syntax). For objects which don't have a particular
+there is no equivalent syntax). For objects which don't have a particular
representation for human consumption, :func:`str` will return the same value as
:func:`repr`. Many values, such as numbers or structures like lists and
dictionaries, have the same representation using either function. Strings, in

--
Repository URL: http://hg.python.org/cpython

python-checkins at python

Aug 15, 2012, 12:38 PM

Post #11 of 13 (137 views)
Permalink

cpython (merge 3.2 -> default): merge with 3.2 [In reply to]

http://hg.python.org/cpython/rev/c0cfa5b2c703
changeset: 78600:c0cfa5b2c703
parent: 78595:a2efe5eeb876
parent: 78599:fa9eedea0b48
user: Sandro Tosi <sandro.tosi [at] gmail>
date: Wed Aug 15 21:37:56 2012 +0200
summary:
merge with 3.2

files:
Doc/howto/functional.rst | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@ -246,9 +246,9 @@
iterator argument and will return the largest or smallest element. The ``"in"``
and ``"not in"`` operators also support iterators: ``X in iterator`` is true if
X is found in the stream returned by the iterator. You'll run into obvious
-problems if the iterator is infinite; ``max()``, ``min()``, and ``"not in"``
+problems if the iterator is infinite; ``max()``, ``min()``
will never return, and if the element X never appears in the stream, the
-``"in"`` operator won't return either.
+``"in"`` and ``"not in"`` operators won't return either.

Note that you can only go forward in an iterator; there's no way to get the
previous element, reset the iterator, or make a copy of it. Iterator objects

--
Repository URL: http://hg.python.org/cpython

python-checkins at python

Aug 24, 2012, 4:37 AM

Post #12 of 13 (118 views)
Permalink

cpython (merge 3.2 -> default): Merge with 3.2 [In reply to]

http://hg.python.org/cpython/rev/c2df6d55f4d2
changeset: 78725:c2df6d55f4d2
parent: 78723:cfb11045fc8a
parent: 78724:081507b4ae40
user: Ross Lagerwall <rosslagerwall [at] gmail>
date: Fri Aug 24 13:32:14 2012 +0200
summary:
Merge with 3.2

files:
Misc/NEWS | 2 ++
Modules/_posixsubprocess.c | 4 +++-
2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,8 @@
Library
-------

+- Issue #15777: Fix a refleak in _posixsubprocess.
+
- Issue ##665194: Update email.utils.localtime to use datetime.astimezone and
correctly handle historic changes in UTC offsets.

diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -568,8 +568,10 @@
}

exec_array = _PySequence_BytesToCharpArray(executable_list);
- if (!exec_array)
+ if (!exec_array) {
+ Py_XDECREF(gc_module);
return NULL;
+ }

/* Convert args and env into appropriate arguments for exec() */
/* These conversions are done in the parent process to avoid allocating

--
Repository URL: http://hg.python.org/cpython

python-checkins at python

Aug 25, 2012, 1:12 AM

Post #13 of 13 (118 views)
Permalink

cpython (merge 3.2 -> default): merge with 3.2 [In reply to]

http://hg.python.org/cpython/rev/016087c46600
changeset: 78762:016087c46600
parent: 78760:afa3dedfee18
parent: 78761:a2bf95458eed
user: Georg Brandl <georg [at] python>
date: Sat Aug 25 10:12:47 2012 +0200
summary:
merge with 3.2

files:
Lib/shutil.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Lib/shutil.py b/Lib/shutil.py
--- a/Lib/shutil.py
+++ b/Lib/shutil.py
@@ -332,7 +332,7 @@
# Copying file access times may fail on Windows
pass
else:
- errors.extend((src, dst, str(why)))
+ errors.append((src, dst, str(why)))
if errors:
raise Error(errors)
return dst

--
Repository URL: http://hg.python.org/cpython

Index | Next | Previous | View Threaded

Interested in having your list archived? Contact Gossamer Threads