Revert "Fix some PEP8 errors"

This reverts commit 45ef6a2dcf10a3cecdf33f2aa2d6a4afb5c851a1.

diff --git a/tweepy/__init__.py b/tweepy/__init__.py
index 4622ae96f722bffe87ff623c31e7a8114e9ef2bd..bf097a985e4b292dc156c56c9c65036a5d7e5a08 100644 (file)
--- a/tweepy/__init__.py
+++ b/tweepy/__init__.py
@@ -9,13 +9,19 @@ __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 8552c64b9c4fd41a29022e7dc2477a7d3c34bc90..4ed5900a6dd77bdb2accdd2c6706c3b6b1fabdd1 100644 (file)
--- a/tweepy/auth.py
+++ b/tweepy/auth.py
@@ -1,3 +1,7 @@
+from urllib2 import Request, urlopen
+import urllib
+import base64
+import json
 import logging
 
 from tweepy.error import TweepError
@@ -7,12 +11,6 @@ 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):
@@ -42,20 +40,15 @@ 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:
@@ -68,14 +61,16 @@ 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_MESSAGE)
+                    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")
             else:
                 url = self._get_oauth_url('authorize')
             self.request_token = self._get_request_token(access_type=access_type)
@@ -83,23 +78,18 @@ 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)
 
@@ -112,20 +102,14 @@ 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)
 
@@ -136,15 +120,13 @@ 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
@@ -161,18 +143,20 @@ 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)