X-Git-Url: https://vcs.fsf.org/?p=rainbowstream.git;a=blobdiff_plain;f=rainbowstream%2Fpy3patch.py;h=7e71e2a04fa897f282e4e53bf0a0a0c0c42d3c89;hp=0dd6be5f3b7c85a77fb56ea6f98e647848e6cb1d;hb=b9eeb635b2a477abf9a166a01c582b76ccafc182;hpb=b13c6a0dff89f4af882c3dffd09e7502585938a3

diff --git a/rainbowstream/py3patch.py b/rainbowstream/py3patch.py
index 0dd6be5..7e71e2a 100644
--- a/rainbowstream/py3patch.py
+++ b/rainbowstream/py3patch.py
@@ -1,24 +1,28 @@
-"""
-  Python 3 supports
-"""
 import sys
 
-# StringIO module
-try:
-    from StringIO import StringIO, BytesIO
-except:
-    from io import StringIO, BytesIO
-
-# HTMLParser module
-try:
+# Library compatibility
+if sys.version[0] == "2":
     from HTMLParser import HTMLParser
-    unescape = HTMLParser().unescape
-except:
-    from html import unescape
+    from urllib2 import URLError
+else:
+    from html.parser import HTMLParser
+    from urllib.error import URLError
+
+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] == "3":
+# Function compatibility
+# xrange, raw_input, map ,unicde
+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))
-else:
-    lmap = lambda f, a: map(f, a)
+    str2u = u2str = lambda x: x