towards supporting unicode: docstring

Author: x0ret

uncompyle6/semantics/helper.py

@@ -105,8 +105,21 @@ def print_docstring(self, indent, docstring):
     self.write(indent)
     if not PYTHON3 and not isinstance(docstring, str):
         # Must be unicode in Python2
-        self.write('u')
-        docstring = repr(docstring.expandtabs())[2:-1]
+        if self.version >= 2.4:
+            if self.version > 2.7:
+                docstring = repr(docstring.expandtabs())[2:-1].decode("unicode-escape")
+            else:
+                self.write('u')
+                docstring = repr(docstring.expandtabs())[2:-1].decode("string-escape").decode("utf-8")
+        else:
+            docstring = repr(docstring.expandtabs())[2:-1]
+    elif PYTHON3 and 2.4 <= self.version <= 2.7:
+        # TODO: check for unicode string
+        try:
+            docstring = repr(docstring.expandtabs())[1:-1].encode("latin-1").decode("utf-8")
+        except UnicodeEncodeError:
+            self.write('u')
+            docstring = repr(docstring.expandtabs())[1:-1]
     else:
         docstring = repr(docstring.expandtabs())[1:-1]
 

uncompyle6/semantics/pysource.py

@@ -363,7 +363,10 @@ def traverse(self, node, indent=None, is_lambda=False):
     def write(self, *data):
         if (len(data) == 0) or (len(data) == 1 and data[0] == ''):
             return
-        out = ''.join((str(j) for j in data))
+        if not PYTHON3:
+            out = ''.join((unicode(j) for j in data))
+        else:
+            out = ''.join((str(j) for j in data))
         n = 0
         for i in out:
             if i == '\n':