introduce the six module and reduce sphinx.util.pycompat implementation. refs #1350.

1 files changed, 3 insertions, 2 deletions

diff --git a/tests/util.py b/tests/util.py
index 8c4ff3dff..5eb879f58 100644
--- a/tests/util.py
+++ b/tests/util.py
@@ -8,12 +8,13 @@
 """
 
 import sys
-import StringIO
 import tempfile
 import shutil
 import re
 from functools import wraps
 
+import six
+
 from sphinx import application
 from sphinx.theming import Theme
 from sphinx.ext.autodoc import AutoDirective
@@ -162,7 +163,7 @@ class TestApp(application.Sphinx):
         if confoverrides is None:
             confoverrides = {}
         if status is None:
-            status = StringIO.StringIO()
+            status = six.StringIO()
         if warning is None:
             warning = ListOutput('stderr')
         if freshenv is None: