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

serhiy.storchaka python-checkins at python.org
Sun Oct 13 22:35:07 CEST 2013


http://hg.python.org/cpython/rev/4c15bf02b7c4
changeset:   86346:4c15bf02b7c4
branch:      3.3
parent:      86343:907da535ed9d
parent:      86338:7a2256a6aceb
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Oct 13 23:27:23 2013 +0300
summary:
  Merge heads

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


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


More information about the Python-checkins mailing list