Merge pull request #14759 from alalek:java_gen_unicode

2019-06-07 16:02:11 +00:00
parent 00367289bd 60fb1fde75
commit 254f88f805
1 changed files with 6 additions and 1 deletions
@@ -11,7 +11,12 @@ from string import Template
 if sys.version_info[0] >= 3:
    from io import StringIO
 else:
-    from cStringIO import StringIO
+    import io
+    class StringIO(io.StringIO):
+        def write(self, s):
+            if isinstance(s, str):
+                s = unicode(s)  # noqa: F821
+            return super(StringIO, self).write(s)

 SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))