diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2013-10-13 20:27:44 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2013-10-13 20:27:44 (GMT) |
| commit | ca1d6db6d3066465a06505f5048610dc7a3c9300 (patch) | |
| tree | ef259741c7bd75ab9ee077f7ec619dcd69f6ecb1 /Doc | |
| parent | 6c64f23340d511294fe148953a32ba7b7b99b9ef (diff) | |
| parent | a7c17e552df7bfdce3d1b493af38891cb59c2521 (diff) | |
| download | cpython-ca1d6db6d3066465a06505f5048610dc7a3c9300.zip cpython-ca1d6db6d3066465a06505f5048610dc7a3c9300.tar.gz cpython-ca1d6db6d3066465a06505f5048610dc7a3c9300.tar.bz2 | |
Merge heads
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/library/contextlib.rst | 2 | ||||
| -rw-r--r-- | Doc/library/othergui.rst | 3 | ||||
| -rw-r--r-- | 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 index cef5f1a..0359750 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 ae5d0db..eb49b99 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/>`_ diff --git a/Doc/tools/sphinx-build.py b/Doc/tools/sphinx-build.py index 91be6f0..a446dfa 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 |