[Python-checkins] cpython (merge 3.5 -> default): merge with 3.5
georg.brandl
python-checkins at python.org
Thu Feb 25 14:18:43 EST 2016
https://hg.python.org/cpython/rev/a8c761bcbf3f
changeset: 100337:a8c761bcbf3f
parent: 100334:7acba55cca95
parent: 100336:1f8dc6f2b171
user: Georg Brandl <georg at python.org>
date: Thu Feb 25 20:18:00 2016 +0100
summary:
merge with 3.5
files:
Doc/distutils/apiref.rst | 6 +++---
Doc/library/email.charset.rst | 5 +++--
Doc/library/mmap.rst | 6 +++---
Doc/library/ossaudiodev.rst | 4 ++--
Doc/library/re.rst | 2 +-
Doc/library/socket.rst | 6 +++---
Doc/library/ssl.rst | 2 +-
Doc/library/stdtypes.rst | 6 +++---
Doc/using/cmdline.rst | 2 +-
Lib/logging/__init__.py | 4 ++--
10 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -876,7 +876,7 @@
archive. *root_dir* and *base_dir* both default to the current directory.
Returns the name of the archive file.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Added support for the ``xztar`` format.
@@ -891,7 +891,7 @@
compression extension (``.gz``, ``.bz2``, ``.xz`` or ``.Z``). Return the
output filename.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Added support for the ``xz`` compression.
@@ -1234,7 +1234,7 @@
<imp.get_tag>` in their name, in a :file:`__pycache__` subdirectory
instead of files without tag in the current directory.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Create ``.pyc`` files according to :pep:`488`.
diff --git a/Doc/library/email.charset.rst b/Doc/library/email.charset.rst
--- a/Doc/library/email.charset.rst
+++ b/Doc/library/email.charset.rst
@@ -101,9 +101,10 @@
returns the string ``base64`` if *body_encoding* is ``BASE64``, and
returns the string ``7bit`` otherwise.
+
.. XXX to_splittable and from_splittable are not there anymore!
- .. method to_splittable(s)
+ .. to_splittable(s)
Convert a possibly multibyte string to a safely splittable format. *s* is
the string to split.
@@ -118,7 +119,7 @@
the Unicode replacement character ``'U+FFFD'``.
- .. method from_splittable(ustr[, to_output])
+ .. from_splittable(ustr[, to_output])
Convert a splittable string back into an encoded string. *ustr* is a
Unicode string to "unsplit".
diff --git a/Doc/library/mmap.rst b/Doc/library/mmap.rst
--- a/Doc/library/mmap.rst
+++ b/Doc/library/mmap.rst
@@ -174,7 +174,7 @@
Optional arguments *start* and *end* are interpreted as in slice notation.
Returns ``-1`` on failure.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
@@ -237,7 +237,7 @@
Optional arguments *start* and *end* are interpreted as in slice notation.
Returns ``-1`` on failure.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
@@ -267,7 +267,7 @@
were written. If the mmap was created with :const:`ACCESS_READ`, then
writing to it will raise a :exc:`TypeError` exception.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
diff --git a/Doc/library/ossaudiodev.rst b/Doc/library/ossaudiodev.rst
--- a/Doc/library/ossaudiodev.rst
+++ b/Doc/library/ossaudiodev.rst
@@ -155,7 +155,7 @@
data may not be written
---see :meth:`writeall`.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
@@ -169,7 +169,7 @@
no return value, since the amount of data written is always equal to the
amount of data supplied.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
diff --git a/Doc/library/re.rst b/Doc/library/re.rst
--- a/Doc/library/re.rst
+++ b/Doc/library/re.rst
@@ -297,7 +297,7 @@
>>> m.group(0)
'egg'
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Added support for group references of fixed length.
``(?<!...)``
diff --git a/Doc/library/socket.rst b/Doc/library/socket.rst
--- a/Doc/library/socket.rst
+++ b/Doc/library/socket.rst
@@ -675,7 +675,7 @@
support IPv6, and :func:`inet_ntop` should be used instead for IPv4/v6 dual
stack support.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
@@ -717,7 +717,7 @@
.. versionchanged:: 3.4
Windows support added
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
@@ -1332,7 +1332,7 @@
ensure that the bytestring contains the proper bits (see the optional built-in
module :mod:`struct` for a way to encode C structures as bytestrings).
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst
--- a/Doc/library/ssl.rst
+++ b/Doc/library/ssl.rst
@@ -344,7 +344,7 @@
string (so you can always use :const:`0.0`). See :rfc:`1750` for more
information on sources of entropy.
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Writable :term:`bytes-like object` is now accepted.
Certificate handling
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -1298,16 +1298,16 @@
only represent sequences that follow a strict pattern and repetition and
concatenation will usually violate that pattern).
- .. data: start
+ .. attribute:: start
The value of the *start* parameter (or ``0`` if the parameter was
not supplied)
- .. data: stop
+ .. attribute:: stop
The value of the *stop* parameter
- .. data: step
+ .. attribute:: step
The value of the *step* parameter (or ``1`` if the parameter was
not supplied)
diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst
--- a/Doc/using/cmdline.rst
+++ b/Doc/using/cmdline.rst
@@ -194,7 +194,7 @@
:class:`str` or :class:`bytes` with :class:`int`. Issue an error when the
option is given twice (:option:`-bb`).
- .. versionchanged: 3.5
+ .. versionchanged:: 3.5
Affects comparisons of :class:`bytes` with :class:`int`.
.. cmdoption:: -B
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -472,7 +472,7 @@
use one of %-formatting, :meth:`str.format` (``{}``) formatting or
:class:`string.Template` formatting in your format string.
- .. versionchanged: 3.2
+ .. versionchanged:: 3.2
Added the ``style`` parameter.
"""
if style not in _STYLES:
@@ -701,7 +701,7 @@
this and the record is then dropped. Returns a zero value if a record
is to be dropped, else non-zero.
- .. versionchanged: 3.2
+ .. versionchanged:: 3.2
Allow filters to be just callables.
"""
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list