Fixes 91. Also added the property rate_limit_limit to get rate limit ceiling for...

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

diff --git a/twitter/api.py b/twitter/api.py
index bb80bcd0de132c35959e01a62e0bc81ce49e346d..8c4379d11560a2a40b3a13f93d2a1dc46d5cb04e 100644 (file)
--- a/twitter/api.py
+++ b/twitter/api.py
@@ -74,14 +74,21 @@ class TwitterResponse(object):
         """
         Remaining requests in the current rate-limit.
         """
-        return int(self.headers.get('X-RateLimit-Remaining', "0"))
+        return int(self.headers.get('X-Rate-Limit-Remaining', "0"))
+
+    @property
+    def rate_limit_limit(self):
+        """
+        Remaining requests in the current rate-limit.
+        """
+        return int(self.headers.get('X-Rate-Limit-Limit', "0"))
 
     @property
     def rate_limit_reset(self):
         """
         Time in UTC epoch seconds when the rate limit will reset.
         """
-        return int(self.headers.get('X-RateLimit-Reset', "0"))
+        return int(self.headers.get('X-Rate-Limit-Reset', "0"))
 
 
 def wrap_response(response, headers):
@@ -155,6 +162,12 @@ class TwitterCall(object):
         if id:
             uri += "/%s" %(id)
 
+        # If an _id kwarg is present, this is treated as id as a CGI
+        # param.
+        _id = kwargs.pop('_id', None)
+        if _id:
+            kwargs['id'] = _id
+
         secure_str = ''
         if self.secure:
             secure_str = 's'
@@ -173,7 +186,6 @@ class TwitterCall(object):
                 body = None
             else:
                 body = arg_data.encode('utf8')
-
         req = urllib_request.Request(uriBase, body, headers)
         return self._handle_response(req, uri, arg_data)
 
@@ -316,7 +328,7 @@ class Twitter(TwitterCall):
 
         if api_version is _DEFAULT:
             if domain == 'api.twitter.com':
-                api_version = '1'
+                api_version = '1.1'
             else:
                 api_version = None