X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fpy3patch.py;h=153d10df737957063078e125dcb3777e7d46d9b6;hp=543b9a1462a27ef2fb5cb7100058159654b32ea4;hb=20fc51b989f7793b032b379aed909680f2654546;hpb=b68e80f6d55d4d9f995403aefb2bd952ea5ebf43 diff --git a/rainbowstream/py3patch.py b/rainbowstream/py3patch.py index 543b9a1..153d10d 100644 --- a/rainbowstream/py3patch.py +++ b/rainbowstream/py3patch.py @@ -9,11 +9,22 @@ 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) + unc = lambda x: x.decode('utf-8') +else: + raw_input = input + lmap = lambda f, a: list(map(f, a)) + unc = lambda x: x