X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/fd2bc88530a75bd1c1811239bb7a67501511b5b2..6af9fa5fb1f61fd4a2f65caf5cc10946f5f278c8:/twitter/api.py

diff --git a/twitter/api.py b/twitter/api.py
index 42ec727..42d9e53 100644
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -1,12 +1,10 @@
 
-from base64 import b64encode
-from urllib import urlencode
-
 import urllib2
 
 from exceptions import Exception
 
 from twitter.twitter_globals import POST_ACTIONS
+from twitter.auth import UserPassAuth, NoAuth
 
 def _py26OrGreater():
     import sys
@@ -19,32 +17,48 @@ else:
 
 class TwitterError(Exception):
     """
-    Exception thrown by the Twitter object when there is an
-    error interacting with twitter.com.
+    Base Exception thrown by the Twitter object when there is a
+    general error interacting with the API.
     """
     pass
 
+class TwitterHTTPError(TwitterError):
+    """
+    Exception thrown by the Twitter object when there is an
+    HTTP error interacting with twitter.com.
+    """
+    def __init__(self, e, uri, format, encoded_args):
+      self.e = e
+      self.uri = uri
+      self.format = format
+      self.encoded_args = encoded_args
+
+    def __str__(self):
+        return "Twitter sent status %i for URL: %s.%s using parameters: (%s)\ndetails: %s" %(
+                    self.e.code, self.uri, self.format, self.encoded_args, self.e.fp.read())
+
 class TwitterCall(object):
     def __init__(
-        self, username, password, format, domain, uri="", agent=None, encoded_args=None):
-        self.username = username
-        self.password = password
+        self, auth, format, domain, uri="", agent=None,
+        encoded_args=None, secure=True):
+        self.auth = auth
         self.format = format
         self.domain = domain
         self.uri = uri
         self.agent = agent
         self.encoded_args = encoded_args
+        self.secure = secure
 
     def __getattr__(self, k):
         try:
             return object.__getattr__(self, k)
         except AttributeError:
             return TwitterCall(
-                self.username, self.password, self.format, self.domain,
-                self.uri + "/" + k, self.agent, self.encoded_args)
+                self.auth, self.format, self.domain,
+                self.uri + "/" + k, self.agent, self.encoded_args, self.secure)
 
     def __call__(self, **kwargs):
-        uri = self.uri
+        uri = self.uri.strip("/")
         method = "GET"
         for action in POST_ACTIONS:
             if self.uri.endswith(action):
@@ -53,11 +67,20 @@ class TwitterCall(object):
                     kwargs["source"] = self.agent
                 break
 
+        secure_str = ''
+        if self.secure:
+            secure_str = 's'
+        dot = ""
+        if self.format != '':
+            dot = "."
+        uriBase = "http%s://%s/%s%s%s" %(
+                    secure_str, self.domain, uri, dot, self.format)
+
         if (not self.encoded_args):
             if kwargs.has_key('id'):
                 uri += "/%s" %(kwargs['id'])
-    
-            self.encoded_args = urlencode(kwargs.items())
+
+            self.encoded_args = self.auth.encode_params(uriBase, method, kwargs)
 
         argStr = ""
         argData = None
@@ -70,14 +93,11 @@ class TwitterCall(object):
         headers = {}
         if (self.agent):
             headers["X-Twitter-Client"] = self.agent
-        if (self.username):
-            headers["Authorization"] = "Basic " + b64encode("%s:%s" %(
-                self.username, self.password))
-
-        req = urllib2.Request(
-                "http://%s/%s.%s%s" %(self.domain, uri, self.format, argStr),
-                argData, headers
-            )
+        if self.auth is not None:
+            headers.update(self.auth.generate_headers())
+
+        req = urllib2.Request(uriBase+argStr, argData, headers)
+        
         try:
             handle = urllib2.urlopen(req)
             if "json" == self.format:
@@ -88,9 +108,7 @@ class TwitterCall(object):
             if (e.code == 304):
                 return []
             else:
-                raise TwitterError(
-                    "Twitter sent status %i for URL: %s.%s using parameters: (%s)\ndetails: %s" %(
-                        e.code, uri, self.format, encoded_kwargs, e.fp.read()))
+                raise TwitterHTTPError(e, uri, self.format, self.encoded_args)
 
 class Twitter(TwitterCall):
     """
@@ -157,14 +175,25 @@ class Twitter(TwitterCall):
     """
     def __init__(
         self, email=None, password=None, format="json", domain="twitter.com",
-        agent=None):
+        agent=None, secure=True, auth=None):
         """
         Create a new twitter API connector using the specified
         credentials (email and password). Format specifies the output
         format ("json" (default) or "xml").
         """
-        if (format not in ("json", "xml")):
+        
+        if email is not None or password is not None:
+            if auth is not None:
+                raise ValueError, "can't specify 'email' or 'password' and 'auth' params"
+            auth = UserPassAuth(email, password)
+
+        if not auth:
+            auth = NoAuth()
+
+        if (format not in ("json", "xml", "")):
             raise TwitterError("Unknown data format '%s'" %(format))
-        TwitterCall.__init__(self, email, password, format, domain, "", agent)
+        TwitterCall.__init__(
+            self, auth, format, domain, "", agent, 
+            secure=secure)
 
-__all__ = ["Twitter", "TwitterError"]
+__all__ = ["Twitter", "TwitterError", "TwitterHTTPError"]