From c3a2916919e9beb5ce22db3a677538715b18f5d1 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 13 Oct 2013 22:19:49 +0200
Subject: [PATCH 1/3] Closes #19248: actually check for Python 3.x in
 tools/sphinx-build.py.

---
 Doc/tools/sphinx-build.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Doc/tools/sphinx-build.py b/Doc/tools/sphinx-build.py
index 91be6f09a79..a446dfa8e18 100644
--- a/Doc/tools/sphinx-build.py
+++ b/Doc/tools/sphinx-build.py
@@ -15,7 +15,7 @@ warnings.filterwarnings('ignore', category=UserWarning, module='jinja2')
 
 if __name__ == '__main__':
 
-    if sys.version_info[:3] < (2, 4, 0):
+    if sys.version_info[:3] < (2, 4, 0) or sys.version_info[:3] > (3, 0, 0):
         sys.stderr.write("""\
 Error: Sphinx needs to be executed with Python 2.4 or newer (not 3.0 though).
 (If you run this from the Makefile, you can set the PYTHON variable

From 810f1d56ea4802399377662ea9a92e8f122da298 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 13 Oct 2013 22:23:27 +0200
Subject: [PATCH 2/3] Wing IDE is switching to PyQt...

---
 Doc/library/othergui.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst
index ae5d0dba489..eb49b994d89 100644
--- a/Doc/library/othergui.rst
+++ b/Doc/library/othergui.rst
@@ -19,8 +19,7 @@ available for Python:
       `PyGTK <http://www.pygtk.org/>`_ provides bindings for an older version
       of the library, GTK+ 2.  It provides an object oriented interface that
       is slightly higher level than the C one.  There are also bindings to
-      `GNOME <http://www.gnome.org>`_.  One well known PyGTK application is
-      `WingIDE <http://wingide.com/>`_. An online `tutorial
+      `GNOME <http://www.gnome.org>`_.  An online `tutorial
       <http://www.pygtk.org/pygtk2tutorial/index.html>`_ is available.
 
    `PyQt <http://www.riverbankcomputing.co.uk/software/pyqt/>`_

From a7c17e552df7bfdce3d1b493af38891cb59c2521 Mon Sep 17 00:00:00 2001
From: Georg Brandl <georg@python.org>
Date: Sun, 13 Oct 2013 22:25:10 +0200
Subject: [PATCH 3/3] Fix spacing of toplevel items.

---
 Doc/library/contextlib.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst
index cef5f1a83be..0359750ffe3 100644
--- a/Doc/library/contextlib.rst
+++ b/Doc/library/contextlib.rst
@@ -94,6 +94,7 @@ Functions and classes provided:
    without needing to explicitly close ``page``.  Even if an error occurs,
    ``page.close()`` will be called when the :keyword:`with` block is exited.
 
+
 .. function:: ignore(*exceptions)
 
    Return a context manager that ignores the specified exceptions if they
@@ -156,6 +157,7 @@ Functions and classes provided:
 
    .. versionadded:: 3.4
 
+
 .. class:: ContextDecorator()
 
    A base class that enables a context manager to also be used as a decorator.