diff options
Diffstat (limited to 'docutils')
| -rw-r--r-- | docutils/docutils/_compat.py | 24 | ||||
| -rwxr-xr-x | docutils/test/test_publisher.py | 8 | ||||
| -rwxr-xr-x | docutils/test/test_writers/test_odt.py | 2 |
3 files changed, 8 insertions, 26 deletions
diff --git a/docutils/docutils/_compat.py b/docutils/docutils/_compat.py deleted file mode 100644 index 2bcfd75ca..000000000 --- a/docutils/docutils/_compat.py +++ /dev/null @@ -1,24 +0,0 @@ -# $Id$ -# Author: Georg Brandl <georg@python.org> -# Copyright: This module has been placed in the public domain. - -""" -Python 2/3 compatibility definitions. - -This module currently provides the following helper symbols: - -* u_prefix (unicode repr prefix: 'u' in 2.x, '' in 3.x) - (Required in docutils/test/test_publisher.py) -* BytesIO (a StringIO class that works with bytestrings) -""" - -import sys - -if sys.version_info < (3, 0): - u_prefix = 'u' - from StringIO import StringIO as BytesIO -else: - u_prefix = b'' - # using this hack since 2to3 "fixes" the relative import - # when using ``from io import BytesIO`` - BytesIO = __import__('io').BytesIO diff --git a/docutils/test/test_publisher.py b/docutils/test/test_publisher.py index 93079beb6..6edceac36 100755 --- a/docutils/test/test_publisher.py +++ b/docutils/test/test_publisher.py @@ -9,10 +9,16 @@ Test the `Publisher` facade and the ``publish_*`` convenience functions. """ import pickle +import sys + import DocutilsTestSupport # must be imported before docutils import docutils from docutils import core, nodes, io -from docutils._compat import u_prefix + +if sys.version_info < (3, 0): + u_prefix = 'u' +else: + u_prefix = b'' test_document = """\ diff --git a/docutils/test/test_writers/test_odt.py b/docutils/test/test_writers/test_odt.py index 43708d1c1..fb8fdacdf 100755 --- a/docutils/test/test_writers/test_odt.py +++ b/docutils/test/test_writers/test_odt.py @@ -34,11 +34,11 @@ from __future__ import absolute_import import os import zipfile import xml.etree.ElementTree as etree +from io import BytesIO from . import DocutilsTestSupport import docutils import docutils.core -from docutils._compat import BytesIO # # Globals |
