Merged revisions 84142 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r84142 | georg.brandl | 2010-08-17 17:07:14 +0200 (Di, 17 Aug 2010) | 1 line
Consistency check for versionadded/changed directives.
........
diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst
index a264ac0..7ebd283 100644
--- a/Doc/c-api/arg.rst
+++ b/Doc/c-api/arg.rst
@@ -320,13 +320,14 @@
the conversion has failed. When the conversion fails, the *converter* function
should raise an exception and leave the content of *address* unmodified.
- If the *converter* returns Py_CLEANUP_SUPPORTED, it may get called a second time
- if the argument parsing eventually fails, giving the converter a chance to release
- any memory that it had already allocated. In this second call, the *object* parameter
- will be NULL; *address* will have the same value as in the original call.
+ If the *converter* returns ``Py_CLEANUP_SUPPORTED``, it may get called a
+ second time if the argument parsing eventually fails, giving the converter a
+ chance to release any memory that it had already allocated. In this second
+ call, the *object* parameter will be NULL; *address* will have the same value
+ as in the original call.
.. versionchanged:: 3.1
- Py_CLEANUP_SUPPORTED was added.
+ ``Py_CLEANUP_SUPPORTED`` was added.
``(items)`` (:class:`tuple`) [*matching-items*]
The object must be a Python sequence whose length is the number of format units
diff --git a/Doc/c-api/long.rst b/Doc/c-api/long.rst
index 19d65b8..9a3d1f1 100644
--- a/Doc/c-api/long.rst
+++ b/Doc/c-api/long.rst
@@ -165,6 +165,7 @@
cannot be represented as a :ctype:`long long`, an
:exc:`OverflowError` is raised and ``-1`` is returned.
+
.. cfunction:: unsigned PY_LONG_LONG PyLong_AsUnsignedLongLong(PyObject *pylong)
.. index::
@@ -176,8 +177,8 @@
returned.
.. versionchanged:: 3.1
- A negative *pylong* now raises :exc:`OverflowError`, not
- :exc:`TypeError`.
+ A negative *pylong* now raises :exc:`OverflowError`, not :exc:`TypeError`.
+
.. cfunction:: unsigned long PyLong_AsUnsignedLongMask(PyObject *io)
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
index 50cc3a3..014571e 100644
--- a/Doc/c-api/unicode.rst
+++ b/Doc/c-api/unicode.rst
@@ -369,6 +369,7 @@
.. versionadded:: 3.1
+
.. cfunction:: PyObject* PyUnicode_DecodeFSDefaultAndSize(const char *s, Py_ssize_t size)
Decode a null-terminated string using :cdata:`Py_FileSystemDefaultEncoding`
diff --git a/Doc/distutils/sourcedist.rst b/Doc/distutils/sourcedist.rst
index 0c29c19..2dea83d 100644
--- a/Doc/distutils/sourcedist.rst
+++ b/Doc/distutils/sourcedist.rst
@@ -206,6 +206,6 @@
:option:`-o` is a shortcut for :option:`--manifest-only`.
.. versionchanged:: 3.1
- An existing generated :file:`MANIFEST` will be regenerated without
- :command:`sdist` comparing its modification time to the one of
- :file:`MANIFEST.in` or :file:`setup.py`.
+ An existing generated :file:`MANIFEST` will be regenerated without
+ :command:`sdist` comparing its modification time to the one of
+ :file:`MANIFEST.in` or :file:`setup.py`.
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index bcedc15..e79f723 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -552,7 +552,7 @@
lightweight and require no more memory than regular tuples.
.. versionchanged:: 3.1
- added support for *rename*.
+ Added support for *rename*.
Example:
@@ -843,7 +843,6 @@
class.
-
:class:`UserList` objects
-------------------------
diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index 49b5673..39c11f3 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -38,14 +38,14 @@
.. function:: dis(x=None)
- Disassemble the *x* object. *x* can denote either a module, a
- class, a method, a function, a code object, a string of source code or a
- byte sequence of raw bytecode. For a module, it disassembles all
- functions. For a class, it disassembles all methods. For a code object
- or sequence of raw bytecode, it prints one line per bytecode instruction.
- Strings are first compiled to code objects with the :func:`compile`
- built-in function before being disassembled. If no object is provided,
- this function disassembles the last traceback.
+ Disassemble the *x* object. *x* can denote either a module, a class, a
+ method, a function, a code object, a string of source code or a byte sequence
+ of raw bytecode. For a module, it disassembles all functions. For a class,
+ it disassembles all methods. For a code object or sequence of raw bytecode,
+ it prints one line per bytecode instruction. Strings are first compiled to
+ code objects with the :func:`compile` built-in function before being
+ disassembled. If no object is provided, this function disassembles the last
+ traceback.
.. function:: distb(tb=None)
diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst
index 20d04ab..539c51d 100644
--- a/Doc/library/hashlib.rst
+++ b/Doc/library/hashlib.rst
@@ -105,10 +105,9 @@
equivalent to ``m.update(a+b)``.
.. versionchanged:: 3.1
-
- The Python GIL is released to allow other threads to run while
- hash updates on data larger than 2048 bytes is taking place when
- using hash algorithms supplied by OpenSSL.
+ The Python GIL is released to allow other threads to run while hash
+ updates on data larger than 2048 bytes is taking place when using hash
+ algorithms supplied by OpenSSL.
.. method:: hash.digest()
diff --git a/Doc/library/io.rst b/Doc/library/io.rst
index faf1aea..afb30a1 100644
--- a/Doc/library/io.rst
+++ b/Doc/library/io.rst
@@ -299,7 +299,7 @@
Return the new absolute position.
.. versionadded:: 3.1
- The ``SEEK_*`` constants
+ The ``SEEK_*`` constants.
.. method:: seekable()
diff --git a/Doc/library/itertools.rst b/Doc/library/itertools.rst
index 8037bfe..02b27ec 100644
--- a/Doc/library/itertools.rst
+++ b/Doc/library/itertools.rst
@@ -207,6 +207,7 @@
.. versionadded:: 3.1
+
.. function:: compress(data, selectors)
Make an iterator that filters elements from *data* returning only those that
@@ -240,7 +241,7 @@
for i in count())``.
.. versionchanged:: 3.1
- added *step* argument and allowed non-integer arguments.
+ Added *step* argument and allowed non-integer arguments.
.. function:: cycle(iterable)
diff --git a/Doc/library/logging.rst b/Doc/library/logging.rst
index a58638d..2b8e92c 100644
--- a/Doc/library/logging.rst
+++ b/Doc/library/logging.rst
@@ -895,6 +895,7 @@
:const:`NOTSET` is found, and that value is returned.
+
.. method:: Logger.debug(msg, *args, **kwargs)
Logs a message with level :const:`DEBUG` on this logger. The *msg* is the
@@ -2638,6 +2639,9 @@
methods have the same signatures as their counterparts in :class:`Logger`, so
you can use the two types of instances interchangeably.
+ The :meth:`isEnabledFor` method was added to :class:`LoggerAdapter`. This
+ method delegates to the underlying logger.
+
Thread Safety
-------------
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
index 9635d8a..9680d7a 100644
--- a/Doc/library/os.rst
+++ b/Doc/library/os.rst
@@ -67,23 +67,22 @@
File Names, Command Line Arguments, and Environment Variables
-------------------------------------------------------------
-In Python, file names, command line arguments, and environment
-variables are represented using the string type. On some systems,
-decoding these strings to and from bytes is necessary before passing
-them to the operating system. Python uses the file system encoding to
-perform this conversion (see :func:`sys.getfilesystemencoding`).
+In Python, file names, command line arguments, and environment variables are
+represented using the string type. On some systems, decoding these strings to
+and from bytes is necessary before passing them to the operating system. Python
+uses the file system encoding to perform this conversion (see
+:func:`sys.getfilesystemencoding`).
.. versionchanged:: 3.1
- On some systems, conversion using the file system encoding may
- fail. In this case, Python uses the ``surrogateescape`` encoding
- error handler, which means that undecodable bytes are replaced by a
- Unicode character U+DCxx on decoding, and these are again
- translated to the original byte on encoding.
+ On some systems, conversion using the file system encoding may fail. In this
+ case, Python uses the ``surrogateescape`` encoding error handler, which means
+ that undecodable bytes are replaced by a Unicode character U+DCxx on
+ decoding, and these are again translated to the original byte on encoding.
-The file system encoding must guarantee to successfully decode all
-bytes below 128. If the file system encoding fails to provide this
-guarantee, API functions may raise UnicodeErrors.
+The file system encoding must guarantee to successfully decode all bytes
+below 128. If the file system encoding fails to provide this guarantee, API
+functions may raise UnicodeErrors.
.. _os-procinfo:
diff --git a/Doc/library/runpy.rst b/Doc/library/runpy.rst
index 6feb4b1..1b48167 100644
--- a/Doc/library/runpy.rst
+++ b/Doc/library/runpy.rst
@@ -67,9 +67,8 @@
It is recommended that the :mod:`sys` module be left alone when invoking this
function from threaded code.
-
.. versionchanged:: 3.1
- Added ability to execute packages by looking for a ``__main__`` submodule
+ Added ability to execute packages by looking for a ``__main__`` submodule.
.. seealso::
diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst
index 8cd5ba6..ae15786 100644
--- a/Doc/library/sqlite3.rst
+++ b/Doc/library/sqlite3.rst
@@ -234,7 +234,6 @@
supplied, this must be a custom cursor class that extends
:class:`sqlite3.Cursor`.
-
.. method:: Connection.commit()
This method commits the current transaction. If you don't call this method,
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst
index ee27f74..c3bf17f 100644
--- a/Doc/library/stdtypes.rst
+++ b/Doc/library/stdtypes.rst
@@ -829,6 +829,9 @@
:func:`codecs.register_error`, see section :ref:`codec-base-classes`. For a
list of possible encodings, see section :ref:`standard-encodings`.
+ .. versionchanged:: 3.1
+ Support for keyword arguments added.
+
.. method:: str.endswith(suffix[, start[, end]])
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index b1044c8..b19d04e 100644
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -873,7 +873,7 @@
and so on.
.. versionchanged:: 3.1
- Added named component attributes
+ Added named component attributes.
.. data:: warnoptions
diff --git a/Doc/library/urllib.parse.rst b/Doc/library/urllib.parse.rst
index 3cf4376..4fb2936 100644
--- a/Doc/library/urllib.parse.rst
+++ b/Doc/library/urllib.parse.rst
@@ -346,7 +346,7 @@
parameters are sent the :func:`quote_plus` for encoding.
.. versionchanged:: 3.2
- query paramater supports bytes and string.
+ Query parameter supports bytes and string objects.
.. seealso::
diff --git a/Doc/library/zipfile.rst b/Doc/library/zipfile.rst
index 7c4721d..3ab78ab 100644
--- a/Doc/library/zipfile.rst
+++ b/Doc/library/zipfile.rst
@@ -66,6 +66,7 @@
.. versionchanged:: 3.1
Support for file and file-like objects.
+
.. data:: ZIP_STORED
The numeric constant for an uncompressed archive member.
diff --git a/Doc/library/zipimport.rst b/Doc/library/zipimport.rst
index 1b23b4c..57ac1e4 100644
--- a/Doc/library/zipimport.rst
+++ b/Doc/library/zipimport.rst
@@ -93,7 +93,7 @@
was imported. Raise :exc:`ZipImportError` if the module couldn't be
found.
- .. versionadded:: 3.1
+ .. versionadded:: 3.1
.. method:: get_source(fullname)