Add some changes not picked up in the transplantation process.

Makefile

@@ -1,4 +1,4 @@
-PYTHON ?= python3
+PYTHON ?= python
 
 .PHONY: all check clean clean-pyc clean-patchfiles clean-generated pylint \
         reindent test

README

@@ -26,6 +26,18 @@ Then, direct your browser to ``_build/html/index.html``.
 Or read them online at <http://sphinx.pocoo.org/>.
 
 
+Testing
+=======
+
+To run the tests with the interpreter available as ``python``, use::
+
+    make test
+
+If you want to use a different interpreter, e.g. ``python3``, use::
+
+    PYTHON=python3 make test
+
+
 Contributing
 ============
 

doc/intro.rst

@@ -45,10 +45,10 @@ See the :ref:`pertinent section in the FAQ list <usingwith>`.
 Prerequisites
 -------------
 
-Sphinx needs at least **Python 2.4** to run, as well as the docutils_ and
-Jinja2_ libraries.  Sphinx should work with docutils version 0.5 or some
-(not broken) SVN trunk snapshot.  If you like to have source code highlighting
-support, you must also install the Pygments_ library.
+Sphinx needs at least **Python 2.4** or **Python 3.1** to run, as well as the
+docutils_ and Jinja2_ libraries.  Sphinx should work with docutils version 0.5
+or some (not broken) SVN trunk snapshot.  If you like to have source code
+highlighting support, you must also install the Pygments_ library.
 
 .. _reStructuredText: http://docutils.sf.net/rst.html
 .. _docutils: http://docutils.sf.net/

tests/test_build_html.py

@@ -51,6 +51,11 @@ HTML_WARNINGS = ENV_WARNINGS + """\
 %(root)s/markup.txt:: WARNING: invalid pair index entry u'keyword; '
 """
 
+if sys.version_info >= (3, 0):
+    ENV_WARNINGS = remove_unicode_literals(ENV_WARNINGS)
+    HTML_WARNINGS = remove_unicode_literals(HTML_WARNINGS)
+
+
 def tail_check(check):
     rex = re.compile(check)
     def checker(nodes):
@@ -61,10 +66,6 @@ def tail_check(check):
     return checker
 
 
-if sys.version_info >= (3, 0):
-    ENV_WARNINGS = remove_unicode_literals(ENV_WARNINGS)
-    HTML_WARNINGS = remove_unicode_literals(HTML_WARNINGS)
-
 HTML_XPATH = {
     'images.html': [
         (".//img[@src='_images/img.png']", ''),