Remove agent cruft. Default to api.twitter.com and version 1.

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

diff --git a/twitter/util.py b/twitter/util.py
index eda73fb6cea26f7c31e5667f978926046f500656..b6e95c6903c7bab15dce3ef56c83eaff4b3cbf19 100644 (file)
--- a/twitter/util.py
+++ b/twitter/util.py
@@ -7,12 +7,15 @@ Internal utility functions.
 
 
 import re
-from htmlentitydefs import name2codepoint
+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,11 +24,11 @@ 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(ret)
             return
         except SyntaxError:
             pass