X-Git-Url: https://jfr.im/git/z_archive/twitter.git/blobdiff_plain/4e9d63435b514ee669b2fb0045180aa1b49abfdc..9f71ad676e68cfd79cd44edf89e0999137bf5981:/twitter/api.py

diff --git a/twitter/api.py b/twitter/api.py
index 118d4fb..42ec727 100644
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -6,7 +6,7 @@ import urllib2
 
 from exceptions import Exception
 
-from twitter.twitter_globals import _POST_ACTIONS
+from twitter.twitter_globals import POST_ACTIONS
 
 def _py26OrGreater():
     import sys
@@ -26,43 +26,46 @@ class TwitterError(Exception):
 
 class TwitterCall(object):
     def __init__(
-        self, username, password, format, domain, uri="", agent=None):
+        self, username, password, format, domain, uri="", agent=None, encoded_args=None):
         self.username = username
         self.password = password
         self.format = format
         self.domain = domain
         self.uri = uri
         self.agent = agent
+        self.encoded_args = encoded_args
+
     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.uri + "/" + k, self.agent, self.encoded_args)
+
     def __call__(self, **kwargs):
         uri = self.uri
         method = "GET"
-        for action in _POST_ACTIONS:
+        for action in POST_ACTIONS:
             if self.uri.endswith(action):
                 method = "POST"
                 if (self.agent):
                     kwargs["source"] = self.agent
                 break
-        
-        id = kwargs.pop('id', None)
-        if id:
-            uri += "/%s" %(id)
 
-        encoded_kwargs = urlencode(kwargs.items())
+        if (not self.encoded_args):
+            if kwargs.has_key('id'):
+                uri += "/%s" %(kwargs['id'])
+    
+            self.encoded_args = urlencode(kwargs.items())
+
         argStr = ""
         argData = None
-        encoded_kwargs = urlencode(kwargs.items())
-        if kwargs:
-            if (method == "GET"):
-                argStr = "?%s" %(encoded_kwargs)
-            else:
-                argData = encoded_kwargs
+        if (method == "GET"):
+            if self.encoded_args:
+                argStr = "?%s" %(self.encoded_args)
+        else:
+            argData = self.encoded_args
 
         headers = {}
         if (self.agent):
@@ -70,13 +73,13 @@ class TwitterCall(object):
         if (self.username):
             headers["Authorization"] = "Basic " + b64encode("%s:%s" %(
                 self.username, self.password))
-        
+
         req = urllib2.Request(
-                "http://%s/%s.%s%s" %(self.domain, self.uri, self.format, argStr),
+                "http://%s/%s.%s%s" %(self.domain, uri, self.format, argStr),
                 argData, headers
             )
         try:
-            handle = urllib2.urlopen(req) 
+            handle = urllib2.urlopen(req)
             if "json" == self.format:
                 return json.loads(handle.read())
             else:
@@ -88,7 +91,7 @@ class TwitterCall(object):
                 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()))
-            
+
 class Twitter(TwitterCall):
     """
     The minimalist yet fully featured Twitter API class.