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. 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 `_ 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 `_. One well known PyGTK application is - `WingIDE `_. An online `tutorial + `GNOME `_. An online `tutorial `_ is available. `PyQt `_ 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