Skip to content

Pep8 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fpietka wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Pep8 #27

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ee30a51
Remove unused packages
fpietka Oct 16, 2016
26e02ae
Unalign assignment
fpietka Oct 16, 2016
01905e4
Remove or add spaces where needed
fpietka Oct 16, 2016
2994a7a
Comparison with None must use 'is'
fpietka Oct 16, 2016
34f67eb
Correct separation
fpietka Oct 16, 2016
4302930
Fix comments lenght
fpietka Oct 16, 2016
14ca7a3
Use 'not in' instead of 'not ... in'
fpietka Oct 16, 2016
2698c89
Remove one useless if level
fpietka Oct 16, 2016
3731801
Fix long lines
fpietka Oct 16, 2016
2395f31
Fix indentation
fpietka Oct 16, 2016
340ddfa
Remove unwanted extra lines
fpietka Oct 16, 2016
01e00aa
Comma not needed in list with only one element
fpietka Oct 16, 2016
727a54e
Remove comma after last element of list
fpietka Oct 16, 2016
c5218f2
Close parenthesis on the last element level
fpietka Oct 16, 2016
21ef148
Remove unused parameters
fpietka Oct 16, 2016
e10bb50
Remove unused variable
fpietka Oct 16, 2016
f8be397
Fix display of server response
fpietka Oct 16, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Unalign assignment
  • Loading branch information
@fpietka
fpietka committed Oct 16, 2016
commit 26e02aefc25dfe076a492fdcfcba88dd598577d3
19 changes: 10 additions & 9 deletions TestDailymotion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
import time
import os


class TestA(unittest.TestCase):

@classmethod
def setUpClass(self):
self.api_base_url = config.BASE_URL or 'http://api.dailymotion.com'
self.api_key = config.CLIENT_ID
self.api_secret = config.CLIENT_SECRET
self.username = config.USERNAME
self.password = config.PASSWORD
self.scope = ['manage_videos', 'manage_playlists', 'userinfo']
self.redirect_uri = config.REDIRECT_URI
self.oauth_authorize_endpoint_url = config.OAUTH_AUTHORIZE_URL or 'https://api.dailymotion.com/oauth/authorize'
self.oauth_token_endpoint_url = config.OAUTH_TOKEN_URL or 'https://api.dailymotion.com/oauth/token'
self.api_base_url = config.BASE_URL or 'http://api.dailymotion.com'
self.api_key = config.CLIENT_ID
self.api_secret = config.CLIENT_SECRET
self.username = config.USERNAME
self.password = config.PASSWORD
self.scope = ['manage_videos', 'manage_playlists', 'userinfo']
self.redirect_uri = config.REDIRECT_URI
self.oauth_authorize_endpoint_url = config.OAUTH_AUTHORIZE_URL or 'https://api.dailymotion.com/oauth/authorize'
self.oauth_token_endpoint_url = config.OAUTH_TOKEN_URL or 'https://api.dailymotion.com/oauth/token'
self.session_file_directory = './data'
if not os.path.exists(self.session_file_directory):
os.makedirs(self.session_file_directory)
Expand Down
36 changes: 18 additions & 18 deletions dailymotion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class SessionStore(object):

def __init__(self):
self._sessions = defaultdict(dict)
self._user = 'default'
self._user = 'default'

def set_user(self, user=None):
self._user = user if user else 'default'
Expand Down Expand Up @@ -131,26 +131,26 @@ def current(self):

class Dailymotion(object):

DEFAULT_DEBUG = False
DEFAULT_TIMEOUT = 5
DEFAULT_API_BASE_URL = 'https://api.dailymotion.com'
DEFAULT_AUTHORIZE_URL = 'https://www.dailymotion.com/oauth/authorize'
DEFAULT_TOKEN_URL = 'https://api.dailymotion.com/oauth/token'
DEFAULT_SESSION_STORE = True
DEFAULT_DEBUG = False
DEFAULT_TIMEOUT = 5
DEFAULT_API_BASE_URL = 'https://api.dailymotion.com'
DEFAULT_AUTHORIZE_URL = 'https://www.dailymotion.com/oauth/authorize'
DEFAULT_TOKEN_URL = 'https://api.dailymotion.com/oauth/token'
DEFAULT_SESSION_STORE = True

def __init__(self, api_base_url=None, debug=None, timeout=None, oauth_authorize_endpoint_url=None, oauth_token_endpoint_url=None, session_store_enabled=None, session_store=None):

self.api_base_url = api_base_url or self.DEFAULT_API_BASE_URL
self.debug = debug or self.DEFAULT_DEBUG
self.timeout = timeout or self.DEFAULT_TIMEOUT
self.oauth_authorize_endpoint_url = oauth_authorize_endpoint_url or self.DEFAULT_AUTHORIZE_URL
self.oauth_token_endpoint_url = oauth_token_endpoint_url or self.DEFAULT_TOKEN_URL
self._grant_type = None
self._grant_info = {}
self._headers = {'Accept' : 'application/json',
'User-Agent' : 'Dailymotion-Python/%s (Python %s)' % (__version__, __python_version__)}
self._session_store_enabled = self.DEFAULT_SESSION_STORE if session_store_enabled is None else session_store_enabled
self._session_store = SessionStore() if session_store is None else session_store
self.api_base_url = api_base_url or self.DEFAULT_API_BASE_URL
self.debug = debug or self.DEFAULT_DEBUG
self.timeout = timeout or self.DEFAULT_TIMEOUT
self.oauth_authorize_endpoint_url = oauth_authorize_endpoint_url or self.DEFAULT_AUTHORIZE_URL
self.oauth_token_endpoint_url = oauth_token_endpoint_url or self.DEFAULT_TOKEN_URL
self._grant_type = None
self._grant_info = {}
self._headers = {'Accept' : 'application/json',
'User-Agent' : 'Dailymotion-Python/%s (Python %s)' % (__version__, __python_version__)}
self._session_store_enabled = self.DEFAULT_SESSION_STORE if session_store_enabled is None else session_store_enabled
self._session_store = SessionStore() if session_store is None else session_store


def set_grant_type(self, grant_type = 'client_credentials', api_key=None, api_secret=None, scope=None, info=None):
Expand Down