[Python-checkins] cpython (merge default -> default): Merge heads

[serhiy.storchaka]

http://hg.python.org/cpython/rev/862bb83113d7
changeset:   86347:862bb83113d7
parent:      86345:c9f424394b96
parent:      86341:096eae786285
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Oct 13 23:27:44 2013 +0300
summary:
  Merge heads

files:
  Doc/library/contextlib.rst |  2 ++
  Doc/library/othergui.rst   |  3 +--
  Doc/tools/sphinx-build.py  |  2 +-
  3 files changed, 4 insertions(+), 3 deletions(-)


diff --git a/Doc/library/contextlib.rst b/Doc/library/contextlib.rst
--- a/Doc/library/contextlib.rst
+++ b/Doc/library/contextlib.rst
@@ -94,6 +94,7 @@
    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 @@
 
    .. versionadded:: 3.4
 
+
 .. class:: ContextDecorator()
 
    A base class that enables a context manager to also be used as a decorator.
diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst
--- a/Doc/library/othergui.rst
+++ b/Doc/library/othergui.rst
@@ -19,8 +19,7 @@
       `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/>`_
diff --git a/Doc/tools/sphinx-build.py b/Doc/tools/sphinx-build.py
--- a/Doc/tools/sphinx-build.py
+++ b/Doc/tools/sphinx-build.py
@@ -15,7 +15,7 @@
 
 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

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