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

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

Revision: 8368
          http://sourceforge.net/p/docutils/code/8368
Author:   milde
Date:     2019-08-27 12:10:14 +0000 (Tue, 27 Aug 2019)
Log Message:
-----------
py3: Handle 'StringIO' to 'io' transition.

This isn't so much a rename as a migration, since things don't do the
same thing.

Based on patch by: Stephen Finucane <st...@th...>

Modified Paths:
--------------
    trunk/docutils/docutils/writers/docutils_xml.py
    trunk/docutils/test/test_utils.py
    trunk/docutils/test/test_writers/test_docutils_xml.py

Modified: trunk/docutils/docutils/writers/docutils_xml.py
===================================================================
--- trunk/docutils/docutils/writers/docutils_xml.py	2019-08-27 12:09:56 UTC (rev 8367)
+++ trunk/docutils/docutils/writers/docutils_xml.py	2019-08-27 12:10:14 UTC (rev 8368)
@@ -12,12 +12,17 @@
 
 import sys
 import xml.sax.saxutils
-from StringIO import StringIO
 
 import docutils
 from docutils import frontend, writers, nodes
 
 if sys.version_info >= (3, 0):
+    from io import StringIO  # noqa
+else:
+    from StringIO import StringIO  # noqa
+
+
+if sys.version_info >= (3, 0):
     unicode = str  # noqa
 
 

Modified: trunk/docutils/test/test_utils.py
===================================================================
--- trunk/docutils/test/test_utils.py	2019-08-27 12:09:56 UTC (rev 8367)
+++ trunk/docutils/test/test_utils.py	2019-08-27 12:10:14 UTC (rev 8368)
@@ -9,13 +9,18 @@
 Test module for utils/__init__.py.
 """
 
-from io import StringIO
 import os
+import sys
 import unittest
 
 from DocutilsTestSupport import docutils, utils, nodes
 
+if sys.version_info >= (3, 0):
+    from io import StringIO
+else:
+    from StringIO import StringIO
 
+
 class ReporterTests(unittest.TestCase):
 
     stream = StringIO()

Modified: trunk/docutils/test/test_writers/test_docutils_xml.py
===================================================================
--- trunk/docutils/test/test_writers/test_docutils_xml.py	2019-08-27 12:09:56 UTC (rev 8367)
+++ trunk/docutils/test/test_writers/test_docutils_xml.py	2019-08-27 12:10:14 UTC (rev 8368)
@@ -15,12 +15,17 @@
 """
 from __future__ import absolute_import
 
-from StringIO import StringIO
+import sys
 
 from . import DocutilsTestSupport # must be imported before docutils
 import docutils
 import docutils.core
 
+if sys.version_info >= (3, 0):
+    from io import StringIO
+else:
+    from StringIO import StringIO
+
 # sample strings
 # --------------
 

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