X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/a5e40197cf272175a8bc4aa39d4c5b6e545c751c..2712c06bcef3f7f31eb904e4142f168f04730bd6:/twitter/util.py

diff --git a/twitter/util.py b/twitter/util.py
index eda73fb..b78a108 100644
--- a/twitter/util.py
+++ b/twitter/util.py
@@ -7,12 +7,16 @@ Internal utility functions.
 
 
 import re
-from htmlentitydefs import name2codepoint
+import sys
+try:
+    from html.entities import name2codepoint
+except ImportError:
+    from htmlentitydefs import name2codepoint
 
 def htmlentitydecode(s):
     return re.sub(
         '&(%s);' % '|'.join(name2codepoint),
-        lambda m: unichr(name2codepoint[m.group(1)]), s)
+        lambda m: chr(name2codepoint[m.group(1)]), s)
 
 def smrt_input(globals_, locals_, ps1=">>> ", ps2="... "):
     inputs = []
@@ -21,13 +25,20 @@ def smrt_input(globals_, locals_, ps1=">>> ", ps2="... "):
             prompt = ps2
         else:
             prompt = ps1
-        inputs.append(raw_input(prompt))
+        inputs.append(input(prompt))
         try:
             ret = eval('\n'.join(inputs), globals_, locals_)
             if ret:
-                print ret
+                print(str(ret))
             return
         except SyntaxError:
             pass
 
+def printNicely(string):
+    if hasattr(sys.stdout, 'buffer'):
+        sys.stdout.buffer.write(string.encode('utf8'))
+        print()
+    else:
+        print(string.encode('utf8'))
+
 __all__ = ["htmlentitydecode", "smrt_input"]