From 792ef5b5b86edeec87bdc94bdca9aadae33517d6 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Fri, 24 May 2019 11:03:44 -0400
Subject: [PATCH] Simplfy - TODO fix unicode in docstrings

---
 test/bytecode_2.4_run/00_docstring.pyc   | Bin 0 -> 1352 bytes
 test/simple_source/stmts/00_docstring.py |  13 +++++++++++++
 uncompyle6/semantics/helper.py           |  13 +++----------
 3 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 test/bytecode_2.4_run/00_docstring.pyc

diff --git a/test/bytecode_2.4_run/00_docstring.pyc b/test/bytecode_2.4_run/00_docstring.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2eb5e8ef5c01d97910b262277e2e9d854da4972b
GIT binary patch
literal 1352
zcmb_c&5qMR44!EU3q{KbX|GoH&=i$yyC<|#3kV@`Ks^Lbs3^*2rfrt|DdX@fF2IAp
z+i~Uzu%}Vm4Mi&u8O5<3`<u@bJK4{}-go(99*gFZ^n6IS8In*!yd){bS5l-<9jkPN
za;)MA?T9ZzNYxe3y=$Cxm&BsZV<^)o)~g~_x`KP~Ho+BmuItWogH@6*=Q$aJOS?Yi
z{4Vb*39ZA{Xg^vXqFnt6bLLT!XbC)KxFjo69h#!9VtryTLvu13g{p|xoc!`VI=o|1
z*jku^kXLbh#u>j?yvwoQ?{DiSV_^BuUAs01vbJF_|A47ja_3QXgLKm($EH2NR~%^1
z@S-Ei10hk0&ypS;k&wG1T5iX>owmDc-J<2*e&=u0Cp~B`-}kLXrA?<(h>Xz{!WbqK
z81D<Z<fA^=*qp83=@?KO3{`{?BspYbKMYk8V;Ei)dAdJx2f?pP!qwhKcX8^TK}H#i
zA-K!NSdzYK^rxQ&z0HO%h>-zYMF_?Dg^tN6YBY(`#1EoM6Y)5$l~!k)oOWsGS9Q*X
zcsqoK&~Ln<t-5@J)F5ySvm)0P*t|~4QY(Lh%Ul9&>J*K)h>}#R$!G`>qRvVr<Nm;g
z{^c<K)3llY-~K#%ctC<adJ%^q-X{H#?Wv^5pHx**1^kx^xaXUh_|TenJ1+qv-J;v{
tNQgrr@5m!sGmrl=0gw6?$Oe1X$7$OaTjcc+^41R+!0;Simp2_+@C)vNB+LK+

literal 0
HcmV?d00001

diff --git a/test/simple_source/stmts/00_docstring.py b/test/simple_source/stmts/00_docstring.py
index d8f2a077..c8e83309 100644
--- a/test/simple_source/stmts/00_docstring.py
+++ b/test/simple_source/stmts/00_docstring.py
@@ -1,7 +1,16 @@
+# -*- coding: utf-8 -*-
 # uncompyle2 bug was not escaping """ properly
 
 # RUNNABLE!
 r'''func placeholder - with ("""\nstring\n""")'''
+
+def uni(word):
+  u"""        <----- SEE 'u' HERE
+  >>> mylen(u"áéíóú")
+  5
+  """
+
+
 def foo():
     r'''func placeholder - ' and with ("""\nstring\n""")'''
 
@@ -39,5 +48,9 @@ def baz():
         >>> t.rundict(m1.__dict__, 'rundict_test_pvt')  # None are skipped.
         TestResults(failed=0, attempted=8)
     """
+    assert uni.__doc__ ==   u"""        <----- SEE 'u' HERE
+  >>> mylen(u"áéíóú")
+  5
+  """
 
 baz()
diff --git a/uncompyle6/semantics/helper.py b/uncompyle6/semantics/helper.py
index f941831e..31bb7be0 100644
--- a/uncompyle6/semantics/helper.py
+++ b/uncompyle6/semantics/helper.py
@@ -137,19 +137,12 @@ def print_docstring(self, indent, docstring):
 
         # Escape triple quote when needed
         if quote == '"""':
-            if self.version > 2.7:
-                replace_str = '\\"""'
-            else:
-                replace_str = '\\"\\"\\"'
-            docstring = docstring.replace(quote, replace_str)
+            replace_str = '\\"""'
         else:
             assert quote == "'''"
-            if self.version > 2.7:
-                replace_str = "\\'''"
-            else:
-                replace_str = "\\'\\'\\'"
-            docstring = docstring.replace(quote, replace_str)
+            replace_str = "\\'''"
 
+        docstring = docstring.replace(quote, replace_str)
         docstring = docstring.replace('\t', '\\\\')
 
     lines = docstring.split('\n')