Merge heads

This commit is contained in:
Serhiy Storchaka 2013-10-13 23:27:44 +03:00
commit ca1d6db6d3
3 changed files with 4 additions and 3 deletions

View File

@ -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.

View File

@ -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/>`_

View File

@ -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