Cleanup after pull from https://bitbucket.org/timmartin/sphinx

tests/run.py

@@ -29,20 +29,20 @@ sys.path.insert(0, path.join(path.dirname(__file__), path.pardir))
 try:
     import nose
 except ImportError:
-    print("The nose package is needed to run the Sphinx test suite.")
+    print('The nose package is needed to run the Sphinx test suite.')
     sys.exit(1)
 
 try:
     import docutils
 except ImportError:
-    print("Sphinx requires the docutils package to be installed")
+    print('Sphinx requires the docutils package to be installed.')
     sys.exit(1)
 
 try:
     import jinja2
 except ImportError:
-    print("Sphinx requires the jinja2 package to be installed")
+    print('Sphinx requires the jinja2 package to be installed.')
     sys.exit(1)
 
-print("Running Sphinx test suite...")
+print('Running Sphinx test suite...')
 nose.main()

tests/test_build_html.py

@@ -11,8 +11,8 @@
 
 import os
 import re
-import htmlentitydefs
 import sys
+import htmlentitydefs
 from StringIO import StringIO
 
 try:

tests/util.py

@@ -193,10 +193,8 @@ def with_app(*args, **kwargs):
 
 def gen_with_app(*args, **kwargs):
     """
-    Make a TestApp with args and kwargs, pass it to the test and clean up
-    properly. The wrapped function is assumed to be a generator and the
-    wrapper function is itself a generator that will iterate over the
-    values of the wrapped function and yield them.
+    Decorate a test generator to pass a TestApp as the first argument to the
+    test generator when it's executed.
     """
     def generator(func):
         @wraps(func)
@@ -226,7 +224,7 @@ def write_file(name, contents, encoding=None):
             contents = contents.encode('ascii')
     else:
         mode = 'w'
-    f = open(str(name), 'wb', encoding=encoding)
+    f = open(str(name), mode, encoding=encoding)
     f.write(contents)
     f.close()