Version bump 1.5. YEEAH.

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

diff --git a/twitter/api.py b/twitter/api.py
index c46b52d4d9ce64c53b58afa5fb5fcbe36db9cc74..6271821d4a6e5ae194dc392f7cc1d616e71c068a 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -69,14 +69,19 @@ class TwitterResponse(object):
 
 def wrap_response(response, headers):
     response_typ = type(response)
-    class WrappedTwitterResponse(TwitterResponse, response_typ):
+    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, headers):
-            response_typ.__init__(self, response)
+        def __init__(self, response):
+            if response_typ is not int:
+                response_typ.__init__(self, response)
             TwitterResponse.__init__(self, headers)
 
-    return WrappedTwitterResponse(response, headers)
+    return WrappedTwitterResponse(response)
 
 
 
@@ -149,7 +154,7 @@ class TwitterCall(object):
                 res = json.loads(handle.read())
                 return wrap_response(res, handle.headers)
             else:
-                return wrap_response(handle.read(), handle.headers)
+                return wrap_response(str(handle.read()), handle.headers)
         except urllib2.HTTPError, e:
             if (e.code == 304):
                 return []