Make oauth_dance use requests.

diff --git a/setup.py b/setup.py
index 43eed00477c87283a5af36adfdd617925c03d437..9aaa25593b2729799d0fdb4bb83e733b6fceb2d6 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -44,5 +44,7 @@ setup(name='twitter',
       twitter-archiver=twitter.archiver:main
       twitter-follow=twitter.follow:main
       twitter-stream-example=twitter.stream_example:main
+      horsee=twitter.horse:main
       """,
       )
+

diff --git a/twitter/horse.py b/twitter/horse.py
index ef310ed5ec8cc966dd7d9dffdfe8ad9dfd8191db..0ea6d6944e1b06192c97c3e638d336d3ee26dd9c 100644 (file)
--- a/twitter/horse.py
+++ b/twitter/horse.py
@@ -21,6 +21,8 @@ import sys
 import os
 
 from .api2 import TwitterAPI
+from .oauth_dance import oauth_dance
+from .oauth import read_token_file, OAuth
 
 
 # lololol
@@ -48,7 +50,7 @@ def markhov_dict(words, levels=LEVELS):
 
 def word_pairs(text):
     ws = [w.strip(",.!'()[]{}") for w in text.split()]
-    words = ["{} {}".format(w0, w1) for w0, w1 in zip(ws, ws[1:])]
+    words = [w0 + " " +  w1 for w0, w1 in zip(ws, ws[1:])]
     return words
 
 def horsify(d, levels=LEVELS, min_words=1, max_words=12, max_length=140):
@@ -83,7 +85,7 @@ def main():
     if not args[1:] or args[0] not in ('--tweet', '--print'):
         print(__doc__)
         sys.exit(1)
-    text = horsify(markhov_dict(open(args[1]).read().decode('utf-8')))
+    text = horsify(markhov_dict(word_pairs(open(args[1]).read().decode('utf-8'))))
     if args[0] == '--print':
         print(text)
     else:

diff --git a/twitter/oauth_dance.py b/twitter/oauth_dance.py
index 17dbae6f44fce9981a6c7f768d53ceff8a23dc29..43f9ea64bd672ae9f99a6e9df5f05afccacc826c 100644 (file)
--- a/twitter/oauth_dance.py
+++ b/twitter/oauth_dance.py
@@ -4,6 +4,8 @@ from __future__ import print_function
 import webbrowser
 import time
 
+import requests
+
 from .api import Twitter
 from .oauth import OAuth, write_token_file
 
@@ -28,11 +30,10 @@ def oauth_dance(app_name, consumer_key, consumer_secret, token_filename=None):
     the file.
     """
     print("Hi there! We're gonna get you all set up to use %s." % app_name)
-    twitter = Twitter(
-        auth=OAuth('', '', consumer_key, consumer_secret),
-        format='', api_version=None)
-    oauth_token, oauth_token_secret = parse_oauth_tokens(
-        twitter.oauth.request_token())
+    response = requests.get(
+        'https://api.twitter.com/oauth/request_token',
+        auth=OAuth('', '', consumer_key, consumer_secret))
+    oauth_token, oauth_token_secret = parse_oauth_tokens(response.text)
     print("""
 In the web browser window that opens please choose to Allow
 access. Copy the PIN number that appears on the next page and paste or
@@ -56,12 +57,11 @@ your PIN:
 
 """ + oauth_url)
     oauth_verifier = _input("Please enter the PIN: ").strip()
-    twitter = Twitter(
+    response = requests.post(
+        'https://api.twitter.com/oauth/access_token',
         auth=OAuth(
-            oauth_token, oauth_token_secret, consumer_key, consumer_secret),
-        format='', api_version=None)
-    oauth_token, oauth_token_secret = parse_oauth_tokens(
-        twitter.oauth.access_token(oauth_verifier=oauth_verifier))
+            oauth_token, oauth_token_secret, consumer_key, consumer_secret))
+    oauth_token, oauth_token_secret = parse_oauth_tokens(response.text)
     if token_filename:
         write_token_file(
             token_filename, oauth_token, oauth_token_secret)
@@ -78,3 +78,4 @@ def parse_oauth_tokens(result):
         elif k == 'oauth_token_secret':
             oauth_token_secret = v
     return oauth_token, oauth_token_secret
+