fix the encoded_kwargs bug

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

diff --git a/twitter/api.py b/twitter/api.py
index 1a5faa384d3e0e692e59fd2ebc7a5a93b566c8fd..5472583fb3385e9c9077238f0f9b7cd3f8186fe7 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -26,20 +26,25 @@ 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, secure=True):
         self.username = username
         self.password = password
         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.uri + "/" + k, self.agent, self.encoded_args)
+
     def __call__(self, **kwargs):
         uri = self.uri
         method = "GET"
@@ -50,18 +55,19 @@ class TwitterCall(object):
                     kwargs["source"] = self.agent
                 break
 
-        id = kwargs.pop('id', None)
-        if id:
-            uri += "/%s" %(id)
+        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 (method == "GET"):
-            if kwargs:
-                argStr = "?%s" %(encoded_kwargs)
+            if self.encoded_args:
+                argStr = "?%s" %(self.encoded_args)
         else:
-            argData = encoded_kwargs
+            argData = self.encoded_args
 
         headers = {}
         if (self.agent):
@@ -70,10 +76,15 @@ class TwitterCall(object):
             headers["Authorization"] = "Basic " + b64encode("%s:%s" %(
                 self.username, self.password))
 
+        secure_str = ''
+        if self.secure:
+            secure_str = 's'
+
         req = urllib2.Request(
-                "http://%s/%s.%s%s" %(self.domain, uri, self.format, argStr),
-                argData, headers
-            )
+                "http%s://%s/%s.%s%s" %(
+                    secure_str, self.domain, uri, self.format, argStr),
+                argData, headers)
+        
         try:
             handle = urllib2.urlopen(req)
             if "json" == self.format:
@@ -86,7 +97,7 @@ class TwitterCall(object):
             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()))
+                        e.code, uri, self.format, self.encoded_args, e.fp.read()))
 
 class Twitter(TwitterCall):
     """
@@ -153,7 +164,7 @@ class Twitter(TwitterCall):
     """
     def __init__(
         self, email=None, password=None, format="json", domain="twitter.com",
-        agent=None):
+        agent=None, secure=True):
         """
         Create a new twitter API connector using the specified
         credentials (email and password). Format specifies the output
@@ -161,6 +172,8 @@ class Twitter(TwitterCall):
         """
         if (format not in ("json", "xml")):
             raise TwitterError("Unknown data format '%s'" %(format))
-        TwitterCall.__init__(self, email, password, format, domain, "", agent)
+        TwitterCall.__init__(
+            self, email, password, format, domain, "", agent, 
+            secure=secure)
 
 __all__ = ["Twitter", "TwitterError"]