make inversion optional

[z_archive/twitter.git] / twitter / util.py

diff --git a/twitter/util.py b/twitter/util.py
index dab8c84948aed351a2945c9ae738417611495dbb..b0a1f48e854d46f5845fc9e57157ae2f024c2778 100644 (file)
--- a/twitter/util.py
+++ b/twitter/util.py
@@ -10,13 +10,14 @@ import re
 import sys
 try:
     from html.entities import name2codepoint
+    unichr = chr
 except ImportError:
     from htmlentitydefs import name2codepoint
 
 def htmlentitydecode(s):
     return re.sub(
         '&(%s);' % '|'.join(name2codepoint),
-        lambda m: chr(name2codepoint[m.group(1)]), s)
+        lambda m: unichr(name2codepoint[m.group(1)]), s)
 
 def smrt_input(globals_, locals_, ps1=">>> ", ps2="... "):
     inputs = []
@@ -29,7 +30,7 @@ def smrt_input(globals_, locals_, ps1=">>> ", ps2="... "):
         try:
             ret = eval('\n'.join(inputs), globals_, locals_)
             if ret:
-                print(ret)
+                print(str(ret))
             return
         except SyntaxError:
             pass