Use httplib2 (patch by Matthew Kemp)

diff --git a/twitter/api.py b/twitter/api.py
index 47dae5d3f19941340244b55f66e45fa463feeb33..22bed5e194eb1eb6ac61277ac729525829e1cba6 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -1,8 +1,6 @@
-
-from base64 import b64encode
 from urllib import urlencode
 
-import httplib
+from httplib2 import Http
 
 from exceptions import Exception
 
@@ -36,6 +34,7 @@ class TwitterCall(object):
         self.domain = domain
         self.uri = uri
         self.agent = agent
+
     def __getattr__(self, k):
         try:
             return object.__getattr__(self, k)
@@ -59,7 +58,7 @@ class TwitterCall(object):
             
         encoded_kwargs = urlencode(kwargs.items())
         argStr = ""
-        if kwargs and (method == "GET"):
+        if encoded_kwargs and (method == "GET"):
             argStr = "?" + encoded_kwargs
 
         headers = {}
@@ -68,38 +67,38 @@ class TwitterCall(object):
         if (self.username):
             headers["Authorization"] = "Basic " + b64encode("%s:%s" %(
                 self.username, self.password))
+
+        kwargs = {
+            "uri": "%s.%s%s" % (self.uri,self.format,argStr),
+            "method": method
+        }
+
         if method == "POST":
-            headers["Content-type"] = "application/x-www-form-urlencoded"
-            headers["Content-length"] = len(encoded_kwargs)
-        
-        c = httplib.HTTPConnection(self.domain)
+            kwargs["headers"] = {}
+            kwargs["headers"]["Content-type"] = "application/x-www-form-urlencoded"
+            kwargs["headers"]["Content-length"] = len(encoded_kwargs)
+            kwargs["body"] = encoded_kwargs
+
         try:
-            c.putrequest(method, "%s.%s%s" %(
-                uri, self.format, argStr))
-            for item in headers.iteritems():
-                c.putheader(*item)
-            c.endheaders()
-            if method == "POST":
-                c.send(encoded_kwargs)
-            r = c.getresponse()
-
-            if (r.status == 304):
+            http = Http()
+            http.add_credentials(self.username, self.password, self.domain)
+            response, content = http.request(**kwargs)
+            if (response.status == 304):
                 return []
-            elif (r.status != 200):
+            elif (response.status != 200):
                 raise TwitterError(
                     "Twitter sent status %i for URL: %s.%s using parameters: (%s)\ndetails: %s" %(
                         r.status, uri, self.format, encoded_kwargs, r.read()))
             if "json" == self.format:
-                return json.loads(r.read())
+                return json.loads(content)
             else:
-                return r.read()
+                return content
         finally:
-            c.close()
+            pass
 
 class Twitter(TwitterCall):
     """
     The minimalist yet fully featured Twitter API class.
-    
     Get RESTful data by accessing members of this class. The result
     is decoded python objects (lists and dicts).
 
@@ -108,19 +107,18 @@ class Twitter(TwitterCall):
       http://apiwiki.twitter.com/
       http://groups.google.com/group/twitter-development-talk/web/api-documentation
     
+    http://apiwiki.twitter.com/
+    http://groups.google.com/group/twitter-development-talk/web/api-documentation
+
     Examples::
-    
+
       twitter = Twitter("hello@foo.com", "password123")
-      
       # Get the public timeline
       twitter.statuses.public_timeline()
-      
       # Get a particular friend's timeline
       twitter.statuses.friends_timeline(id="billybob")
-      
       # Also supported (but totally weird)
       twitter.statuses.friends_timeline.billybob()
-      
       # Send a direct message
       twitter.direct_messages.new(
           user="billybob",
@@ -136,24 +134,30 @@ class Twitter(TwitterCall):
       # Search for the latest News on #gaza
       twitter_search.search(q="#gaza")
 
+      # Find the latest search trends
+      twitter_search.trends()
+      
+      # Search for the latest News on #gaza
+      twitter_search(q="#gaza")
+        
     Using the data returned::
 
       Twitter API calls return decoded JSON. This is converted into
       a bunch of Python lists, dicts, ints, and strings. For example,
-
+        
       x = twitter.statuses.public_timeline()
-
+      
       # The first 'tweet' in the timeline
       x[0]
-
+      
       # The screen name of the user who wrote the first 'tweet'
       x[0]['user']['screen_name']
-    
+
     Getting raw XML data::
-    
+
       If you prefer to get your Twitter data in XML format, pass
       format="xml" to the Twitter object when you instantiate it:
-      
+
       twitter = Twitter(format="xml")
       
       The output will not be parsed in any way. It will be a raw string