Merge pull request #92 from erfaan/fix-91

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

diff --git a/twitter/util.py b/twitter/util.py
index 4396b07dabc3408d4f6113edb26b7687c7b2d5db..aa7a837dd2e04abf5fca12dddc12b2bf66bdacbb 100644 (file)
--- a/twitter/util.py
+++ b/twitter/util.py
@@ -11,14 +11,16 @@ import contextlib
 import re
 import sys
 import time
-import urllib2
-import urlparse
 
 try:
     from html.entities import name2codepoint
     unichr = chr
+    import urllib.request as urllib2
+    import urllib.parse as urlparse
 except ImportError:
     from htmlentitydefs import name2codepoint
+    import urllib2
+    import urlparse
 
 def htmlentitydecode(s):
     return re.sub(
@@ -83,7 +85,7 @@ class Fail(object):
 def find_links(line):
     """Find all links in the given line. The function returns a sprintf style
     format string (with %s placeholders for the links) and a list of urls."""
-    l = line.replace(u"%", u"%%")
+    l = line.replace("%", "%%")
     regex = "(https?://[^ )]+)"
     return (
         re.sub(regex, "%s", l),