don't drop user input after spaces when attempting eval

[rainbowstream.git] / rainbowstream / py3patch.py

diff --git a/rainbowstream/py3patch.py b/rainbowstream/py3patch.py
index 83e5f0a1845bc4d781d2192a10f66ba71c77e208..153d10df737957063078e125dcb3777e7d46d9b6 100644 (file)
--- a/rainbowstream/py3patch.py
+++ b/rainbowstream/py3patch.py
@@ -10,18 +10,21 @@ except:
     from io import StringIO, BytesIO
 
 # HTMLParser module
-
-try:
+if sys.version[0] == "2":
     from HTMLParser import HTMLParser
-    def unescape(s):
-        p = HTMLParser()
-        return p.unescape(s)
-except:
-    from html import unescape
+else:
+    from html.parser import HTMLParser
+unescape = HTMLParser().unescape
+# According to https://github.com/python/cpython/blob/master/Lib/html/parser.py#L547 ,
+# in python 3.5 maybe I should use
+# from html import unescape
+# but it is a far-future story:)
 
-# raw_input and map functiion behaviour
-if sys.version[0] == "3":
+# raw_input and map function behaviour
+if sys.version[0] == "2":
+    lmap = lambda f, a: map(f, a)
+    unc = lambda x: x.decode('utf-8')
+else:
     raw_input = input
     lmap = lambda f, a: list(map(f, a))
-else:
-    lmap = lambda f, a: map(f, a)
+    unc = lambda x: x