Add Hatem to AUTHORS file, prep for 0.4.5 release soonish

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

diff --git a/twitter/api.py b/twitter/api.py
index aa0660fc18de9c7c1c44d2586d2c1c6be24b9a16..bc7f3c3feb8166935aea5d7af96be92cde42b762 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -6,50 +6,75 @@ import httplib
 
 from exceptions import Exception
 
+def _py26OrGreater():
+    import sys
+    return sys.hexversion > 0x20600f0
+
+if _py26OrGreater():
+    import json
+else:
+    import simplejson as json
+
 class TwitterError(Exception):
+    """
+    Exception thrown by the Twitter object when there is an
+    error interacting with twitter.com.
+    """
     pass
 
 class TwitterCall(object):
-    def __init__(self, username, password, format, uri=""):
+    def __init__(self, username, password, format, domain, uri=""):
         self.username = username
         self.password = password
         self.format = format
         self.uri = uri
+        self.domain = domain
     def __getattr__(self, k):
         try:
             return object.__getattr__(self, k)
         except AttributeError:
             return TwitterCall(
-                self.username, self.password, self.format, 
+                self.username, self.password, self.format, self.domain,
                 self.uri + "/" + k)
     def __call__(self, **kwargs):
         method = "GET"
-        if self.uri.endswith('new') or self.uri.endswith('update'):
+        if (self.uri.endswith('new') 
+            or self.uri.endswith('update')
+            or self.uri.endswith('create')
+            or self.uri.endswith('destroy')):
             method = "POST"
+        
+        encoded_kwargs = urlencode(kwargs.items())
         argStr = ""
-        if kwargs:
-            argStr = "?" + urlencode(kwargs.items())
-        c = httplib.HTTPConnection("twitter.com")
+        if kwargs and (method == "GET"):
+            argStr = "?" + encoded_kwargs
+
+        headers = {}
+        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)
         try:
-            c.putrequest(method, "/%s.%s%s" %(
+            c.putrequest(method, "%s.%s%s" %(
                 self.uri, self.format, argStr))
-            if (self.username):
-                c.putheader(
-                    "Authorization", "Basic " + b64encode("%s:%s" %(
-                        self.username, self.password)))
-            if (method == "POST"):
-                # TODO specify charset
-                pass
+            for item in headers.iteritems():
+                c.putheader(*item)
             c.endheaders()
+            if method == "POST":
+                c.send(encoded_kwargs)
             r = c.getresponse()
+
             if (r.status == 304):
                 return []
             elif (r.status != 200):
                 raise TwitterError("Twitter sent status %i: %s" %(
                     r.status, r.read()))
-            if ("json" == self.format):
-                import simplejson
-                return simplejson.loads(r.read())
+            if "json" == self.format:
+                return json.loads(r.read())
             else:
                 return r.read()
         finally:
@@ -63,7 +88,9 @@ class Twitter(TwitterCall):
     is decoded python objects (lists and dicts).
 
     The Twitter API is documented here:
-    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::
     
@@ -83,6 +110,16 @@ class Twitter(TwitterCall):
           user="billybob",
           text="I think yer swell!")
 
+    Searching Twitter::
+        
+        twitter_search = Twitter(domain="search.twitter.com")
+
+        # 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
@@ -106,7 +143,7 @@ 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"):
+    def __init__(self, email=None, password=None, format="json", domain="twitter.com"):
         """
         Create a new twitter API connector using the specified
         credentials (email and password). Format specifies the output
@@ -114,12 +151,6 @@ class Twitter(TwitterCall):
         """
         if (format not in ("json", "xml")):
             raise TwitterError("Unknown data format '%s'" %(format))
-        if (format == "json"):
-            try:
-                import simplejson
-            except ImportError:
-                raise TwitterError(
-                    "format not available: simplejson is not installed")
-        TwitterCall.__init__(self, email, password, format)
-
-__all__ = ["Twitter"]
+        TwitterCall.__init__(self, email, password, format, domain)
+
+__all__ = ["Twitter", "TwitterError"]