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

This commit is contained in:
Takayuki Shimizukawa
2014-04-29 11:46:47 +09:00
parent 1e4b390b22
commit 68290a266c
38 changed files with 142 additions and 137 deletions
+5 -5
View File
@@ -9,9 +9,9 @@
:license: BSD, see LICENSE for details.
"""
from StringIO import StringIO
import six
from docutils import nodes
from sphinx.application import ExtensionError
from sphinx.domains import Domain
@@ -49,7 +49,7 @@ def test_emit_with_nonascii_name_node(app):
def test_output():
status, warnings = StringIO(), StringIO()
status, warnings = six.StringIO(), six.StringIO()
app = TestApp(status=status, warning=warnings)
try:
status.truncate(0) # __init__ writes to status
@@ -70,7 +70,7 @@ def test_output():
def test_extensions():
status, warnings = StringIO(), StringIO()
status, warnings = six.StringIO(), six.StringIO()
app = TestApp(status=status, warning=warnings)
try:
app.setup_extension('shutil')
@@ -85,7 +85,7 @@ def test_domain_override():
name = 'foo'
class C(Domain):
name = 'foo'
status, warnings = StringIO(), StringIO()
status, warnings = six.StringIO(), six.StringIO()
app = TestApp(status=status, warning=warnings)
try:
# No domain know named foo.