From: murat Date: Wed, 17 Sep 2014 18:26:51 +0000 (+0300) Subject: Fix some PEP8 errors X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=45ef6a2dcf10a3cecdf33f2aa2d6a4afb5c851a1;p=tweepy.git Fix some PEP8 errors --- diff --git a/tweepy/__init__.py b/tweepy/__init__.py index bf097a9..4622ae9 100644 --- a/tweepy/__init__.py +++ b/tweepy/__init__.py @@ -9,19 +9,13 @@ __version__ = '2.3' __author__ = 'Joshua Roesslein' __license__ = 'MIT' -from tweepy.models import Status, User, DirectMessage, Friendship, SavedSearch, SearchResults, ModelFactory, Category -from tweepy.error import TweepError from tweepy.api import API -from tweepy.cache import Cache, MemoryCache, FileCache -from tweepy.auth import OAuthHandler, AppAuthHandler -from tweepy.streaming import Stream, StreamListener -from tweepy.cursor import Cursor # Global, unauthenticated instance of API api = API() + def debug(enable=True, level=1): import httplib httplib.HTTPConnection.debuglevel = level - diff --git a/tweepy/auth.py b/tweepy/auth.py index 4ed5900..8552c64 100644 --- a/tweepy/auth.py +++ b/tweepy/auth.py @@ -1,7 +1,3 @@ -from urllib2 import Request, urlopen -import urllib -import base64 -import json import logging from tweepy.error import TweepError @@ -11,6 +7,12 @@ from requests_oauthlib import OAuth1Session, OAuth1 from requests.auth import AuthBase from urlparse import parse_qs + +WARNING_MESSAGE = """Warning! Due to a Twitter API bug, +signin_with_twitter and access_type don't always play nice +together.Details: https://dev.twitter.com/discussions/21281""" + + class AuthHandler(object): def apply_auth(self, url, method, headers, parameters): @@ -40,15 +42,20 @@ class OAuthHandler(AuthHandler): self.access_token_secret = None self.callback = callback self.username = None - self.oauth = OAuth1Session(consumer_key, client_secret=consumer_secret, callback_uri=self.callback) + self.oauth = OAuth1Session(consumer_key, + client_secret=consumer_secret, + callback_uri=self.callback) def _get_oauth_url(self, endpoint): return 'https://' + self.OAUTH_HOST + self.OAUTH_ROOT + endpoint def apply_auth(self): - return OAuth1(self.consumer_key, client_secret=self.consumer_secret, resource_owner_key=self.access_token, resource_owner_secret=self.access_token_secret) + return OAuth1(self.consumer_key, + client_secret=self.consumer_secret, + resource_owner_key=self.access_token, + resource_owner_secret=self.access_token_secret) - def _get_request_token(self, access_type = None): + def _get_request_token(self, access_type=None): try: url = self._get_oauth_url('request_token') if access_type: @@ -61,16 +68,14 @@ class OAuthHandler(AuthHandler): self.access_token = key self.access_token_secret = secret - def get_authorization_url(self, signin_with_twitter = False, access_type = None): + def get_authorization_url(self, signin_with_twitter=False, + access_type=None): """Get the authorization URL to redirect the user""" try: if signin_with_twitter: url = self._get_oauth_url('authenticate') if access_type: - logging.warning( - "Warning! Due to a Twitter API bug, signin_with_twitter " - "and access_type don't always play nice together. Details: " - "https://dev.twitter.com/discussions/21281") + logging.warning(WARNING_MESSAGE) else: url = self._get_oauth_url('authorize') self.request_token = self._get_request_token(access_type=access_type) @@ -78,18 +83,23 @@ class OAuthHandler(AuthHandler): except Exception as e: raise TweepError(e) - def get_access_token(self, verifier = None): + def get_access_token(self, verifier=None): """ After user has authorized the request token, get access token with user supplied verifier. """ try: url = self._get_oauth_url('access_token') - self.oauth = OAuth1Session(self.consumer_key, client_secret=self.consumer_secret, resource_owner_key=self.request_token['oauth_token'], resource_owner_secret=self.request_token['oauth_token_secret'], verifier=verifier, callback_uri=self.callback) + self.oauth = OAuth1Session(self.consumer_key, + client_secret=self.consumer_secret, + resource_owner_key=self.request_token['oauth_token'], + resource_owner_secret=self.request_token['oauth_token_secret'], + verifier=verifier, + callback_uri=self.callback) resp = self.oauth.fetch_access_token(url) self.access_token = resp['oauth_token'] self.access_token_secret = resp['oauth_token_secret'] - return (self.access_token, self.access_token_secret) + return self.access_token, self.access_token_secret except Exception as e: raise TweepError(e) @@ -102,14 +112,20 @@ class OAuthHandler(AuthHandler): """ try: url = self._get_oauth_url('access_token') - oauth = OAuth1(self.consumer_key, client_secret=self.consumer_secret) - r = requests.post(url=url, auth=oauth, headers={'x_auth_mode': - 'client_auth', 'x_auth_username': username, 'x_auth_password': - password}) + oauth = OAuth1(self.consumer_key, + client_secret=self.consumer_secret) + r = requests.post(url=url, + auth=oauth, + headers={'x_auth_mode': + 'client_auth', + 'x_auth_username': username, + 'x_auth_password': password}) print r.content credentials = parse_qs(r.content) - return (credentials.get('oauth_token')[0], credentials.get('oauth_token_secret')[0]) + return credentials.get('oauth_token')[0], \ + credentials.get('oauth_token_secret')[0] + except Exception as e: raise TweepError(e) @@ -120,13 +136,15 @@ class OAuthHandler(AuthHandler): if user: self.username = user.screen_name else: - raise TweepError('Unable to get username, invalid oauth token!') + raise TweepError('Unable to get username,' + ' invalid oauth token!') return self.username class OAuth2Bearer(AuthBase): def __init__(self, bearer_token): self.bearer_token = bearer_token + def __call__(self, request): request.headers['Authorization'] = 'Bearer ' + self.bearer_token return request @@ -143,20 +161,18 @@ class AppAuthHandler(AuthHandler): self.consumer_secret = consumer_secret self._bearer_token = '' - resp = requests.post(self._get_oauth_url('token'), auth=(self.consumer_key, self.consumer_secret), - data={'grant_type': 'client_credentials'}) + resp = requests.post(self._get_oauth_url('token'), + auth=(self.consumer_key, self.consumer_secret), + data={'grant_type': 'client_credentials'}) data = resp.json() if data.get('token_type') != 'bearer': raise TweepError('Expected token_type to equal "bearer", but got %s \ instead' % data.get('token_type')) - self._bearer_token = data['access_token'] - def _get_oauth_url(self, endpoint): return 'https://' + self.OAUTH_HOST + self.OAUTH_ROOT + endpoint - def apply_auth(self): return OAuth2Bearer(self._bearer_token)