From: Joshua Roesslein <jroesslein@opengov.com>
Date: Sun, 27 Apr 2014 05:00:08 +0000 (-0700)
Subject: Fix errors due to Requests merge.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=86f0712b781f82bdb6598e8e4022ea5e50110da8;p=tweepy.git

Fix errors due to Requests merge.
---

diff --git a/tweepy/auth.py b/tweepy/auth.py
index 439a690..b304139 100644
--- a/tweepy/auth.py
+++ b/tweepy/auth.py
@@ -1,10 +1,8 @@
-#Embedded file name: /home/aaron/repos/tweepy/tweepy/auth.py
 from urllib2 import Request, urlopen
 import urllib
 import base64
 import json
 
-from tweepy import oauth
 from tweepy.error import TweepError
 from tweepy.api import API
 import requests
diff --git a/tweepy/binder.py b/tweepy/binder.py
index 68074fa..a15c492 100644
--- a/tweepy/binder.py
+++ b/tweepy/binder.py
@@ -162,12 +162,12 @@ def bind_api(**config):
                             auth=auth)
                 except Exception, e:
                     raise TweepError('Failed to send request: %s' % e)
-                rem_calls = resp.getheader('x-rate-limit-remaining')
+                rem_calls = resp.headers.get('x-rate-limit-remaining')
                 if rem_calls is not None:
                     self._remaining_calls = int(rem_calls)
                 elif isinstance(self._remaining_calls, int):
                     self._remaining_calls -= 1
-                reset_time = resp.getheader('x-rate-limit-reset')
+                reset_time = resp.headers.get('x-rate-limit-reset')
                 if reset_time is not None:
                     self._reset_time = int(reset_time)
                 if self.wait_on_rate_limit and self._remaining_calls == 0 and (resp.status == 429 or resp.status == 420): # if ran out of calls before waiting switching retry last call