Merge branch 'master' into python3

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

diff --git a/twitter/api.py b/twitter/api.py
index b7ba19857e3939586b14eb5b85f521f7f20507ac..f675822f03e2500f978568e10eb88e3d2c2d885a 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -1,6 +1,4 @@
-import urllib2
-
-from exceptions import Exception
+import urllib.request, urllib.error, urllib.parse
 
 from twitter.twitter_globals import POST_ACTIONS
 from twitter.auth import NoAuth
@@ -67,25 +65,22 @@ class TwitterResponse(object):
         return int(self.headers.getheader('X-RateLimit-Reset'))
 
 
-# Multiple inheritance makes my inner Java nerd cry. Why can't I just
-# add arbitrary attributes to list or str objects?! Guido, we need to
-# talk.
-class TwitterJsonListResponse(TwitterResponse, list):
-    __doc__ = """Twitter JSON Response
-    """ + TwitterResponse.__doc__
-    def __init__(self, lst, headers):
-        TwitterResponse.__init__(self, headers)
-        list.__init__(self, lst)
-class TwitterJsonDictResponse(TwitterResponse, dict):
-    __doc__ = """Twitter JSON Response
-    """ + TwitterResponse.__doc__
-    def __init__(self, d, headers):
-        TwitterResponse.__init__(self, headers)
-        dict.__init__(self, d)
+def wrap_response(response, headers):
+    response_typ = type(response)
+    if response_typ is bool:
+        # HURF DURF MY NAME IS PYTHON AND I CAN'T SUBCLASS bool.
+        response_typ = int
+
+    class WrappedTwitterResponse(response_typ, TwitterResponse):
+        __doc__ = TwitterResponse.__doc__
+
+        def __init__(self, response):
+            if response_typ is not int:
+                response_typ.__init__(self, response)
+            TwitterResponse.__init__(self, headers)
+
+    return WrappedTwitterResponse(response)
 
-class TwitterXmlResponse(TwitterResponse, str):
-    __doc__ = """Twitter XML Response
-    """ + TwitterResponse.__doc__
 
 
 class TwitterCall(object):
@@ -115,8 +110,8 @@ class TwitterCall(object):
         for uripart in self.uriparts:
             # If this part matches a keyword argument, use the
             # supplied value otherwise, just use the part.
-            uriparts.append(unicode(kwargs.pop(uripart, uripart)))
-        uri = u'/'.join(uriparts)
+            uriparts.append(str(kwargs.pop(uripart, uripart)))
+        uri = '/'.join(uriparts)
 
         method = "GET"
         for action in POST_ACTIONS:
@@ -147,23 +142,19 @@ class TwitterCall(object):
                 uriBase += '?' + arg_data
                 body = None
             else:
-                body = arg_data
+                body = arg_data.encode('utf8')
 
-        req = urllib2.Request(uriBase, body, headers)
+        req = urllib.request.Request(uriBase, body, headers)
 
         try:
-            handle = urllib2.urlopen(req)
+            handle = urllib.request.urlopen(req)
             if "json" == self.format:
-                res = json.loads(handle.read())
-                response_cls = (
-                    TwitterJsonListResponse if type(res) is list
-                    else TwitterJsonDictResponse)
-                return response_cls(res, handle.headers)
+                res = json.loads(handle.read().decode('utf8'))
+                return wrap_response(res, handle.headers)
             else:
-                r = TwitterXmlResponse(handle.read())
-                r.headers = handle.headers
-                return r
-        except urllib2.HTTPError, e:
+                return wrap_response(
+                    handle.read().decode('utf8'), handle.headers)
+        except urllib.error.HTTPError as e:
             if (e.code == 304):
                 return []
             else:
@@ -288,6 +279,4 @@ class Twitter(TwitterCall):
             secure=secure, uriparts=uriparts)
 
 
-__all__ = ["Twitter", "TwitterError", "TwitterHTTPError",
-           "TwitterJsonListResponse", "TwitterJsonDictResponse",
-           "TwitterXmlResponse"]
+__all__ = ["Twitter", "TwitterError", "TwitterHTTPError", "TwitterResponse"]