[Python-checkins] cpython (merge 3.4 -> default): merge with 3.4

[georg.brandl]

http://hg.python.org/cpython/rev/d9cdfaf9ac04
changeset:   89947:d9cdfaf9ac04
parent:      89945:86e00b82abc5
parent:      89946:b4be6a008fa5
user:        Georg Brandl <georg at python.org>
date:        Mon Mar 24 09:06:33 2014 +0100
summary:
  merge with 3.4

files:
  Doc/c-api/exceptions.rst        |  8 ++++----
  Doc/c-api/object.rst            |  1 +
  Doc/library/doctest.rst         |  3 ++-
  Doc/library/faulthandler.rst    |  4 ++--
  Doc/library/functions.rst       |  1 +
  Doc/library/imaplib.rst         |  1 +
  Doc/library/multiprocessing.rst |  4 ++--
  Doc/library/selectors.rst       |  2 +-
  Doc/library/sys.rst             |  3 ++-
  Doc/library/urllib.request.rst  |  7 ++++---
  10 files changed, 20 insertions(+), 14 deletions(-)


diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -247,7 +247,7 @@
    filename object, for raising errors when a function that takes two filenames
    fails.
 
-.. versionadded:: 3.4
+   .. versionadded:: 3.4
 
 
 .. c:function:: PyObject* PyErr_SetFromErrnoWithFilename(PyObject *type, const char *filename)
@@ -295,7 +295,7 @@
    but accepts a second filename object.
    Availability: Windows.
 
-.. versionadded:: 3.4
+   .. versionadded:: 3.4
 
 
 .. c:function:: PyObject* PyErr_SetExcFromWindowsErrWithFilename(PyObject *type, int ierr, const char *filename)
@@ -321,7 +321,7 @@
    attributes, which make the exception printing subsystem think the exception
    is a :exc:`SyntaxError`.
 
-.. versionadded:: 3.4
+   .. versionadded:: 3.4
 
 
 .. c:function:: void PyErr_SyntaxLocationEx(char *filename, int lineno, int col_offset)
@@ -329,7 +329,7 @@
    Like :c:func:`PyErr_SyntaxLocationObject`, but *filename* is a byte string
    decoded from the filesystem encoding (:func:`os.fsdecode`).
 
-.. versionadded:: 3.2
+   .. versionadded:: 3.2
 
 
 .. c:function:: void PyErr_SyntaxLocation(char *filename, int lineno)
diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -364,6 +364,7 @@
 
    .. versionadded:: 3.4
 
+
 .. c:function:: PyObject* PyObject_GetItem(PyObject *o, PyObject *key)
 
    Return element of *o* corresponding to the object *key* or *NULL* on failure.
diff --git a/Doc/library/doctest.rst b/Doc/library/doctest.rst
--- a/Doc/library/doctest.rst
+++ b/Doc/library/doctest.rst
@@ -502,7 +502,8 @@
 :ref:`doctest directives <doctest-directives>`, and may be passed to the
 doctest command line interface via the ``-o`` option.
 
-.. versionadded:: 3.4 the ``-o`` command line option
+.. versionadded:: 3.4
+   The ``-o`` command line option.
 
 The first group of options define test semantics, controlling aspects of how
 doctest decides whether actual output matches an example's expected output:
diff --git a/Doc/library/faulthandler.rst b/Doc/library/faulthandler.rst
--- a/Doc/library/faulthandler.rst
+++ b/Doc/library/faulthandler.rst
@@ -4,6 +4,8 @@
 .. module:: faulthandler
    :synopsis: Dump the Python traceback.
 
+.. versionadded:: 3.3
+
 This module contains functions to dump Python tracebacks explicitly, on a fault,
 after a timeout, or on a user signal. Call :func:`faulthandler.enable` to
 install fault handlers for the :const:`SIGSEGV`, :const:`SIGFPE`,
@@ -36,8 +38,6 @@
 The module is implemented in C, so tracebacks can be dumped on a crash or when
 Python is deadlocked.
 
-.. versionadded:: 3.3
-
 
 Dump the traceback
 ------------------
diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -832,6 +832,7 @@
    .. versionadded:: 3.4
       The *default* keyword-only argument.
 
+
 .. function:: next(iterator[, default])
 
    Retrieve the next item from the *iterator* by calling its
diff --git a/Doc/library/imaplib.rst b/Doc/library/imaplib.rst
--- a/Doc/library/imaplib.rst
+++ b/Doc/library/imaplib.rst
@@ -451,6 +451,7 @@
       :attr:`ssl.SSLContext.check_hostname` and *Server Name Indication* (see
       :data:`ssl.HAS_SNI`).
 
+
 .. method:: IMAP4.status(mailbox, names)
 
    Request named status conditions for *mailbox*.
diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst
--- a/Doc/library/multiprocessing.rst
+++ b/Doc/library/multiprocessing.rst
@@ -138,9 +138,9 @@
 
 .. versionchanged:: 3.4
    *spawn* added on all unix platforms, and *forkserver* added for
-     some unix platforms.
+   some unix platforms.
    Child processes no longer inherit all of the parents inheritable
-     handles on Windows.
+   handles on Windows.
 
 On Unix using the *spawn* or *forkserver* start methods will also
 start a *semaphore tracker* process which tracks the unlinked named
diff --git a/Doc/library/selectors.rst b/Doc/library/selectors.rst
--- a/Doc/library/selectors.rst
+++ b/Doc/library/selectors.rst
@@ -217,7 +217,7 @@
       This returns the file descriptor used by the underlying
       :func:`select.devpoll` object.
 
-.. versionadded:: 3.5
+   .. versionadded:: 3.5
 
 .. class:: KqueueSelector()
 
diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -12,11 +12,12 @@
 
 .. data:: abiflags
 
-   On POSIX systems where Python is build with the standard ``configure``
+   On POSIX systems where Python was built with the standard ``configure``
    script, this contains the ABI flags as specified by :pep:`3149`.
 
    .. versionadded:: 3.2
 
+
 .. data:: argv
 
    The list of command line arguments passed to a Python script. ``argv[0]`` is the
diff --git a/Doc/library/urllib.request.rst b/Doc/library/urllib.request.rst
--- a/Doc/library/urllib.request.rst
+++ b/Doc/library/urllib.request.rst
@@ -523,9 +523,10 @@
    Return a list of tuples (header_name, header_value) of the Request headers.
 
 .. versionchanged:: 3.4
-  Request methods add_data, has_data, get_data, get_type, get_host,
-  get_selector, get_origin_req_host and is_unverifiable deprecated since 3.3
-  have been removed.
+   The request methods add_data, has_data, get_data, get_type, get_host,
+   get_selector, get_origin_req_host and is_unverifiable that were deprecated
+   since 3.3 have been removed.
+
 
 .. _opener-director-objects:
 

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