From: Georg Brandl <georg@python.org>
Date: Mon, 24 Mar 2014 08:06:33 +0000 (+0100)
Subject: merge with 3.4
X-Git-Tag: v3.5.0a1~2035
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77605cb93727fd0fc8809af6e9292e12c8200cb2;p=thirdparty%2FPython%2Fcpython.git

merge with 3.4
---

77605cb93727fd0fc8809af6e9292e12c8200cb2
diff --cc Doc/library/selectors.rst
index 980a398c2893,98377c890f02..8bd9e1ce2e2d
--- a/Doc/library/selectors.rst
+++ b/Doc/library/selectors.rst
@@@ -208,16 -207,6 +208,16 @@@ below
        This returns the file descriptor used by the underlying
        :func:`select.epoll` object.
  
 +.. class:: DevpollSelector()
 +
 +   :func:`select.devpoll`-based selector.
 +
 +   .. method:: fileno()
 +
 +      This returns the file descriptor used by the underlying
 +      :func:`select.devpoll` object.
 +
- .. versionadded:: 3.5
++   .. versionadded:: 3.5
  
  .. class:: KqueueSelector()