[Docutils-checkins] SF.net SVN: docutils:[8369] trunk/docutils

[<mi...@us...>]

Revision: 8369
          http://sourceforge.net/p/docutils/code/8369
Author:   milde
Date:     2019-08-27 12:10:26 +0000 (Tue, 27 Aug 2019)
Log Message:
-----------
Remove auxiliary Python 2/3 compatibility definition module.

No longer required since setting minimal supported version to 2.7.
The remaining issues are now handled directly in the affected modules.

Modified Paths:
--------------
    trunk/docutils/test/test_publisher.py
    trunk/docutils/test/test_writers/test_odt.py

Removed Paths:
-------------
    trunk/docutils/docutils/_compat.py

Deleted: trunk/docutils/docutils/_compat.py
===================================================================
--- trunk/docutils/docutils/_compat.py	2019-08-27 12:10:14 UTC (rev 8368)
+++ trunk/docutils/docutils/_compat.py	2019-08-27 12:10:26 UTC (rev 8369)
@@ -1,24 +0,0 @@
-# $Id$
-# Author: Georg Brandl <ge...@py...>
-# 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

Modified: trunk/docutils/test/test_publisher.py
===================================================================
--- trunk/docutils/test/test_publisher.py	2019-08-27 12:10:14 UTC (rev 8368)
+++ trunk/docutils/test/test_publisher.py	2019-08-27 12:10:26 UTC (rev 8369)
@@ -9,12 +9,18 @@
 """
 
 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 = """\
 Test Document
 =============

Modified: trunk/docutils/test/test_writers/test_odt.py
===================================================================
--- trunk/docutils/test/test_writers/test_odt.py	2019-08-27 12:10:14 UTC (rev 8368)
+++ trunk/docutils/test/test_writers/test_odt.py	2019-08-27 12:10:26 UTC (rev 8369)
@@ -34,11 +34,11 @@
 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

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.