X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/1fc85ab1aed3e44b834dc2bb6c28b3b74233d372..327e556bac9b74a1fe975d4c632c698493ff31cd:/twitter/api.py

diff --git a/twitter/api.py b/twitter/api.py
index 02274c6..c913dc2 100644
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -2,7 +2,7 @@
 from base64 import b64encode
 from urllib import urlencode
 
-import httplib
+import urllib2
 
 from exceptions import Exception
 
@@ -29,9 +29,7 @@ _POST_ACTIONS = [
 
 class TwitterCall(object):
     def __init__(
-        self, username, password, format, domain, uri="",
-        agent="Python Twitter Tools"
-    ):
+        self, username, password, format, domain, uri="", agent=None):
         self.username = username
         self.password = password
         self.format = format
@@ -44,17 +42,16 @@ class TwitterCall(object):
         except AttributeError:
             return TwitterCall(
                 self.username, self.password, self.format, self.domain,
-                self.uri + "/" + k, self.agent
-            )
+                self.uri + "/" + k, self.agent)
     def __call__(self, **kwargs):
         uri = self.uri
         method = "GET"
         for action in _POST_ACTIONS:
             if self.uri.endswith(action):
                 method = "POST"
+                if (self.agent):
+                    kwargs["source"] = self.agent
                 break
-            if (self.agent):
-                kwargs["source"] = self.agent
         
         id = kwargs.pop('id', None)
         if id:
@@ -62,8 +59,13 @@ class TwitterCall(object):
             
         encoded_kwargs = urlencode(kwargs.items())
         argStr = ""
-        if kwargs and (method == "GET"):
-            argStr = "?" + encoded_kwargs
+        argData = None
+        encoded_kwargs = urlencode(kwargs.items())
+        if kwargs:
+            if (method == "GET"):
+                argStr = "?%s" %(encoded_kwargs)
+            else:
+                argData = encoded_kwargs
 
         headers = {}
         if (self.agent):
@@ -71,34 +73,25 @@ class TwitterCall(object):
         if (self.username):
             headers["Authorization"] = "Basic " + b64encode("%s:%s" %(
                 self.username, self.password))
-        if method == "POST":
-            headers["Content-type"] = "application/x-www-form-urlencoded"
-            headers["Content-length"] = len(encoded_kwargs)
         
-        c = httplib.HTTPConnection(self.domain)
+        req = urllib2.Request(
+                "http://%s/%s.%s%s" %(self.domain, self.uri, self.format, argStr),
+                argData, headers
+            )
         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):
+            handle = urllib2.urlopen(req) 
+            if "json" == self.format:
+                return json.loads(handle.read())
+            else:
+                return handle.read()
+        except urllib2.HTTPError, e:
+            if (e.code == 304):
                 return []
-            elif (r.status != 200):
+            else:
                 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())
-            else:
-                return r.read()
-        finally:
-            c.close()
-
+                        e.code, uri, self.format, encoded_kwargs, e.fp.read()))
+            
 class Twitter(TwitterCall):
     """
     The minimalist yet fully featured Twitter API class.
@@ -162,7 +155,9 @@ class Twitter(TwitterCall):
       The output will not be parsed in any way. It will be a raw string
       of XML.
     """
-    def __init__(self, email=None, password=None, format="json", domain="twitter.com"):
+    def __init__(
+        self, email=None, password=None, format="json", domain="twitter.com",
+        agent=None):
         """
         Create a new twitter API connector using the specified
         credentials (email and password). Format specifies the output
@@ -170,6 +165,6 @@ class Twitter(TwitterCall):
         """
         if (format not in ("json", "xml")):
             raise TwitterError("Unknown data format '%s'" %(format))
-        TwitterCall.__init__(self, email, password, format, domain)
+        TwitterCall.__init__(self, email, password, format, domain, "", agent)
 
 __all__ = ["Twitter", "TwitterError"]