Merge pull request #253 from bbolli/limit-retry

[RFC] Handle API rate limiting

diff --cc README
Simple merge

diff --cc twitter/api.py
index fd33edd343e3ec6dc84ce17d45b7bacfff97f14c,4b9d459e74407a8db2bafb4e006cc813c35f3f1e..059bb62f9f35eaf46eda7c860b5b127bb67921c2
--- 1/twitter/api.py
--- 2/twitter/api.py
+++ b/twitter/api.py
@@@ -267,13 -266,11 +271,16 @@@ class TwitterCall(object)
              headers['Content-Type'] = \
                  'multipart/form-data; boundary=%s' % BOUNDARY
  
 +            if sys.version_info[:2] <= (2, 7):
 +                uriBase = uriBase.encode("utf-8")
 +                for k in headers:
 +                    headers[k.encode('utf-8')] = headers.pop(k)
 +
          req = urllib_request.Request(uriBase, body, headers)
-         return self._handle_response(req, uri, arg_data, _timeout)
+         if self.retry:
+             return self._handle_response_with_retry(req, uri, arg_data, _timeout)
+         else:
+             return self._handle_response(req, uri, arg_data, _timeout)
  
      def _handle_response(self, req, uri, arg_data, _timeout=None):
          kwargs = {}