Merge branch 'use_arrow'

[rainbowstream.git] / rainbowstream / py3patch.py

diff --git a/rainbowstream/py3patch.py b/rainbowstream/py3patch.py
index 05fe7ff469cba4ce2fc2307143dfba37000e2465..b19bdca01fe4cdbf40b8c18ba3bb5918e2e04736 100644 (file)
--- a/rainbowstream/py3patch.py
+++ b/rainbowstream/py3patch.py
@@ -9,9 +9,24 @@ try:
 except:
     from io import StringIO, BytesIO
 
-# raw_input and map functiion behaviour
-if sys.version[0] == "3":
-    raw_input = input
-    lmap = lambda f, a: list(map(f, a))
+# HTMLParser module
+if sys.version[0] == "2":
+    from HTMLParser import HTMLParser
 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 function behaviour
+if sys.version[0] == "2":
     lmap = lambda f, a: map(f, a)
+    str2u = lambda x: x.decode('utf-8')
+    u2str = lambda x: x.encode('utf-8')
+else:
+    xrange = range
+    raw_input = input
+    lmap = lambda f, a: list(map(f, a))
+    str2u = u2str = lambda x: x