[Python-checkins] r85252 - in python/branches/release31-maint: Doc/c-api/arg.rst Doc/c-api/long.rst Doc/c-api/unicode.rst Doc/distutils/sourcedist.rst Doc/library/collections.rst Doc/library/dis.rst Doc/library/hashlib.rst Doc/library/io.rst Doc/library/itertools.rst Doc/library/logging.rst Doc/library/os.rst Doc/library/runpy.rst Doc/library/sqlite3.rst Doc/library/stdtypes.rst Doc/library/sys.rst Doc/library/urllib.parse.rst Doc/library/zipfile.rst Doc/library/zipimport.rst

Wed Oct 6 10:43:56 CEST 2010

Author: georg.brandl
Date: Wed Oct 6 10:43:56 2010
New Revision: 85252
Log:
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.
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Doc/c-api/arg.rst
 python/branches/release31-maint/Doc/c-api/long.rst
 python/branches/release31-maint/Doc/c-api/unicode.rst
 python/branches/release31-maint/Doc/distutils/sourcedist.rst
 python/branches/release31-maint/Doc/library/collections.rst
 python/branches/release31-maint/Doc/library/dis.rst
 python/branches/release31-maint/Doc/library/hashlib.rst
 python/branches/release31-maint/Doc/library/io.rst
 python/branches/release31-maint/Doc/library/itertools.rst
 python/branches/release31-maint/Doc/library/logging.rst
 python/branches/release31-maint/Doc/library/os.rst
 python/branches/release31-maint/Doc/library/runpy.rst
 python/branches/release31-maint/Doc/library/sqlite3.rst
 python/branches/release31-maint/Doc/library/stdtypes.rst
 python/branches/release31-maint/Doc/library/sys.rst
 python/branches/release31-maint/Doc/library/urllib.parse.rst
 python/branches/release31-maint/Doc/library/zipfile.rst
 python/branches/release31-maint/Doc/library/zipimport.rst
Modified: python/branches/release31-maint/Doc/c-api/arg.rst
==============================================================================

--- python/branches/release31-maint/Doc/c-api/arg.rst	(original)
+++ python/branches/release31-maint/Doc/c-api/arg.rst	Wed Oct 6 10:43:56 2010
@@ -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
Modified: python/branches/release31-maint/Doc/c-api/long.rst
==============================================================================
--- python/branches/release31-maint/Doc/c-api/long.rst	(original)
+++ python/branches/release31-maint/Doc/c-api/long.rst	Wed Oct 6 10:43:56 2010
@@ -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)
 
Modified: python/branches/release31-maint/Doc/c-api/unicode.rst
==============================================================================
--- python/branches/release31-maint/Doc/c-api/unicode.rst	(original)
+++ python/branches/release31-maint/Doc/c-api/unicode.rst	Wed Oct 6 10:43:56 2010
@@ -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`
Modified: python/branches/release31-maint/Doc/distutils/sourcedist.rst
==============================================================================
--- python/branches/release31-maint/Doc/distutils/sourcedist.rst	(original)
+++ python/branches/release31-maint/Doc/distutils/sourcedist.rst	Wed Oct 6 10:43:56 2010
@@ -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`.
Modified: python/branches/release31-maint/Doc/library/collections.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/collections.rst	(original)
+++ python/branches/release31-maint/Doc/library/collections.rst	Wed Oct 6 10:43:56 2010
@@ -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
 -------------------------
 
Modified: python/branches/release31-maint/Doc/library/dis.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/dis.rst	(original)
+++ python/branches/release31-maint/Doc/library/dis.rst	Wed Oct 6 10:43:56 2010
@@ -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)
Modified: python/branches/release31-maint/Doc/library/hashlib.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/hashlib.rst	(original)
+++ python/branches/release31-maint/Doc/library/hashlib.rst	Wed Oct 6 10:43:56 2010
@@ -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()
Modified: python/branches/release31-maint/Doc/library/io.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/io.rst	(original)
+++ python/branches/release31-maint/Doc/library/io.rst	Wed Oct 6 10:43:56 2010
@@ -299,7 +299,7 @@
 Return the new absolute position.
 
 .. versionadded:: 3.1
- The ``SEEK_*`` constants
+ The ``SEEK_*`` constants.
 
 .. method:: seekable()
 
Modified: python/branches/release31-maint/Doc/library/itertools.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/itertools.rst	(original)
+++ python/branches/release31-maint/Doc/library/itertools.rst	Wed Oct 6 10:43:56 2010
@@ -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)
 
Modified: python/branches/release31-maint/Doc/library/logging.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/logging.rst	(original)
+++ python/branches/release31-maint/Doc/library/logging.rst	Wed Oct 6 10:43:56 2010
@@ -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
 -------------
Modified: python/branches/release31-maint/Doc/library/os.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/os.rst	(original)
+++ python/branches/release31-maint/Doc/library/os.rst	Wed Oct 6 10:43:56 2010
@@ -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:
Modified: python/branches/release31-maint/Doc/library/runpy.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/runpy.rst	(original)
+++ python/branches/release31-maint/Doc/library/runpy.rst	Wed Oct 6 10:43:56 2010
@@ -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::
Modified: python/branches/release31-maint/Doc/library/sqlite3.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/sqlite3.rst	(original)
+++ python/branches/release31-maint/Doc/library/sqlite3.rst	Wed Oct 6 10:43:56 2010
@@ -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,
Modified: python/branches/release31-maint/Doc/library/stdtypes.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/stdtypes.rst	(original)
+++ python/branches/release31-maint/Doc/library/stdtypes.rst	Wed Oct 6 10:43:56 2010
@@ -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]])
 
Modified: python/branches/release31-maint/Doc/library/sys.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/sys.rst	(original)
+++ python/branches/release31-maint/Doc/library/sys.rst	Wed Oct 6 10:43:56 2010
@@ -873,7 +873,7 @@
 and so on.
 
 .. versionchanged:: 3.1
- Added named component attributes
+ Added named component attributes.
 
 .. data:: warnoptions
 
Modified: python/branches/release31-maint/Doc/library/urllib.parse.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/urllib.parse.rst	(original)
+++ python/branches/release31-maint/Doc/library/urllib.parse.rst	Wed Oct 6 10:43:56 2010
@@ -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::
Modified: python/branches/release31-maint/Doc/library/zipfile.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/zipfile.rst	(original)
+++ python/branches/release31-maint/Doc/library/zipfile.rst	Wed Oct 6 10:43:56 2010
@@ -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.
Modified: python/branches/release31-maint/Doc/library/zipimport.rst
==============================================================================
--- python/branches/release31-maint/Doc/library/zipimport.rst	(original)
+++ python/branches/release31-maint/Doc/library/zipimport.rst	Wed Oct 6 10:43:56 2010
@@ -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)
