Updated to use correct OAuth lib.

diff --git a/setup.py b/setup.py
index 9aaa25593b2729799d0fdb4bb83e733b6fceb2d6..5cd65aaaba915d3dfe2c4242e58f4b6501d3a780 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,9 @@ version = '1.9.0'
 
 install_requires = [
     # -*- Extra requirements: -*-
-    "requests >= 0.13"
+    "oauthlib==0.4.2",
+    "requests==1.2.3",
+    "requests-oauthlib==0.3.2",
     ]
 
 setup(name='twitter',

diff --git a/twitter/auth.py b/twitter/auth.py
index f35a059dfb36be4dab6960da85baa28042e6fb67..baebe24a1145061d2c65c8af61cb4caee8febfb2 100644 (file)
--- a/twitter/auth.py
+++ b/twitter/auth.py
@@ -1,4 +1,5 @@
-from requests.auth import HTTPBasicAuth, OAuth1
+from requests.auth import HTTPBasicAuth
+
 
 def UserPassAuth(username, password):
     """
@@ -7,6 +8,7 @@ def UserPassAuth(username, password):
     """
     return HTTPBasicAuth(username, password)
 
+
 def NoAuth():
     """
     No authentication authenticator.

diff --git a/twitter/oauth.py b/twitter/oauth.py
index ad9f4799c2363a5c797fdd2346bb4daba9604853..df3d114c2bb8aacfff5cf9fb01f1db53799081e5 100644 (file)
--- a/twitter/oauth.py
+++ b/twitter/oauth.py
@@ -44,7 +44,7 @@ code it all goes like this::
 
 from __future__ import print_function
 
-from requests.auth import OAuth1
+from requests_oauthlib import OAuth1
 
 
 def write_token_file(filename, oauth_token, oauth_token_secret):
@@ -68,7 +68,7 @@ def OAuth(token, token_secret, consumer_key, consumer_secret):
     """
     An OAuth authenticator.
     """
-    return OAuth1(unicode(consumer_key), unicode(consumer_secret), 
+    return OAuth1(unicode(consumer_key), unicode(consumer_secret),
                   unicode(token), unicode(token_secret),
                   signature_type="query")