X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fpy3patch.py;h=b19bdca01fe4cdbf40b8c18ba3bb5918e2e04736;hp=543b9a1462a27ef2fb5cb7100058159654b32ea4;hb=7c437a0f019d51e4f2cd4dc4def34ce138f3d33b;hpb=77f1d210dfd44f5b6c33cc58150b633643621bb0;ds=sidebyside

diff --git a/rainbowstream/py3patch.py b/rainbowstream/py3patch.py
index 543b9a1..b19bdca 100644
--- a/rainbowstream/py3patch.py
+++ b/rainbowstream/py3patch.py
@@ -9,11 +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:
-    lmap = lambda f,a: map(f,a)
-
+    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