Browse Source

remove unnecessary assignment parenthesis

master-ytdl-org
Remita Amine 7 years ago
parent
commit
68217024e8
33 changed files with 32 additions and 42 deletions
  1. +1
    -1
      youtube_dl/extractor/animeondemand.py
  2. +1
    -1
      youtube_dl/extractor/atresplayer.py
  3. +1
    -1
      youtube_dl/extractor/bambuser.py
  4. +1
    -1
      youtube_dl/extractor/crunchyroll.py
  5. +1
    -1
      youtube_dl/extractor/curiositystream.py
  6. +1
    -1
      youtube_dl/extractor/dramafever.py
  7. +1
    -1
      youtube_dl/extractor/facebook.py
  8. +1
    -1
      youtube_dl/extractor/fc2.py
  9. +1
    -1
      youtube_dl/extractor/funimation.py
  10. +1
    -1
      youtube_dl/extractor/gdcvault.py
  11. +0
    -5
      youtube_dl/extractor/globo.py
  12. +1
    -6
      youtube_dl/extractor/hidive.py
  13. +1
    -1
      youtube_dl/extractor/hrti.py
  14. +1
    -1
      youtube_dl/extractor/iqiyi.py
  15. +1
    -1
      youtube_dl/extractor/niconico.py
  16. +1
    -1
      youtube_dl/extractor/noco.py
  17. +1
    -1
      youtube_dl/extractor/packtpub.py
  18. +1
    -1
      youtube_dl/extractor/patreon.py
  19. +1
    -1
      youtube_dl/extractor/pluralsight.py
  20. +1
    -1
      youtube_dl/extractor/roosterteeth.py
  21. +1
    -1
      youtube_dl/extractor/safari.py
  22. +1
    -1
      youtube_dl/extractor/sina.py
  23. +1
    -1
      youtube_dl/extractor/tennistv.py
  24. +1
    -1
      youtube_dl/extractor/tubitv.py
  25. +1
    -1
      youtube_dl/extractor/tumblr.py
  26. +1
    -1
      youtube_dl/extractor/twitch.py
  27. +1
    -1
      youtube_dl/extractor/udemy.py
  28. +1
    -1
      youtube_dl/extractor/vessel.py
  29. +1
    -1
      youtube_dl/extractor/viki.py
  30. +1
    -1
      youtube_dl/extractor/vimeo.py
  31. +1
    -1
      youtube_dl/extractor/vk.py
  32. +1
    -1
      youtube_dl/extractor/youtube.py
  33. +1
    -1
      youtube_dl/extractor/zattoo.py

+ 1
- 1
youtube_dl/extractor/animeondemand.py View File

@ -52,7 +52,7 @@ class AnimeOnDemandIE(InfoExtractor):
}]
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/atresplayer.py View File

@ -74,7 +74,7 @@ class AtresPlayerIE(InfoExtractor):
self._login()
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/bambuser.py View File

@ -44,7 +44,7 @@ class BambuserIE(InfoExtractor):
}
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/crunchyroll.py View File

@ -49,7 +49,7 @@ class CrunchyrollBaseIE(InfoExtractor):
})
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/curiositystream.py View File

@ -35,7 +35,7 @@ class CuriosityStreamBaseIE(InfoExtractor):
return result['data']
def _real_initialize(self):
(email, password) = self._get_login_info()
email, password = self._get_login_info()
if email is None:
return
result = self._download_json(


+ 1
- 1
youtube_dl/extractor/dramafever.py View File

@ -42,7 +42,7 @@ class DramaFeverBaseIE(InfoExtractor):
self._login()
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/facebook.py View File

@ -226,7 +226,7 @@ class FacebookIE(InfoExtractor):
return urls
def _login(self):
(useremail, password) = self._get_login_info()
useremail, password = self._get_login_info()
if useremail is None:
return


+ 1
- 1
youtube_dl/extractor/fc2.py View File

@ -46,7 +46,7 @@ class FC2IE(InfoExtractor):
}]
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None or password is None:
return False


+ 1
- 1
youtube_dl/extractor/funimation.py View File

@ -51,7 +51,7 @@ class FunimationIE(InfoExtractor):
}]
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return
try:


+ 1
- 1
youtube_dl/extractor/gdcvault.py View File

@ -91,7 +91,7 @@ class GDCVaultIE(InfoExtractor):
]
def _login(self, webpage_url, display_id):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None or password is None:
self.report_warning('It looks like ' + webpage_url + ' requires a login. Try specifying a username and password and try again.')
return None


+ 0
- 5
youtube_dl/extractor/globo.py View File

@ -23,7 +23,6 @@ from ..utils import (
class GloboIE(InfoExtractor):
_VALID_URL = r'(?:globo:|https?://.+?\.globo\.com/(?:[^/]+/)*(?:v/(?:[^/]+/)?|videos/))(?P<id>\d{7,})'
_LOGGED_IN = False
_NETRC_MACHINE = 'globo'
_TESTS = [{
'url': 'http://g1.globo.com/carros/autoesporte/videos/t/exclusivos-do-g1/v/mercedes-benz-gla-passa-por-teste-de-colisao-na-europa/3607726/',
@ -68,9 +67,6 @@ class GloboIE(InfoExtractor):
}]
def _real_initialize(self):
if self._LOGGED_IN:
return
email, password = self._get_login_info()
if email is None:
return
@ -91,7 +87,6 @@ class GloboIE(InfoExtractor):
resp = self._parse_json(e.cause.read(), None)
raise ExtractorError(resp.get('userMessage') or resp['id'], expected=True)
raise
self._LOGGED_IN = True
def _real_extract(self, url):
video_id = self._match_id(url)


+ 1
- 6
youtube_dl/extractor/hidive.py View File

@ -18,7 +18,6 @@ class HiDiveIE(InfoExtractor):
# so disabling geo bypass completely
_GEO_BYPASS = False
_NETRC_MACHINE = 'hidive'
_LOGGED_IN = False
_LOGIN_URL = 'https://www.hidive.com/account/login'
_TESTS = [{
@ -38,10 +37,7 @@ class HiDiveIE(InfoExtractor):
}]
def _real_initialize(self):
if self._LOGGED_IN:
return
(email, password) = self._get_login_info()
email, password = self._get_login_info()
if email is None:
return
@ -56,7 +52,6 @@ class HiDiveIE(InfoExtractor):
})
self._download_webpage(
self._LOGIN_URL, None, 'Logging in', data=urlencode_postdata(data))
self._LOGGED_IN = True
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)


+ 1
- 1
youtube_dl/extractor/hrti.py View File

@ -66,7 +66,7 @@ class HRTiBaseIE(InfoExtractor):
self._logout_url = modules['user']['resources']['logout']['uri']
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
# TODO: figure out authentication with cookies
if username is None or password is None:
self.raise_login_required()


+ 1
- 1
youtube_dl/extractor/iqiyi.py View File

@ -239,7 +239,7 @@ class IqiyiIE(InfoExtractor):
return ohdave_rsa_encrypt(data, e, N)
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
# No authentication to be performed
if not username:


+ 1
- 1
youtube_dl/extractor/niconico.py View File

@ -163,7 +163,7 @@ class NiconicoIE(InfoExtractor):
self._login()
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
# No authentication to be performed
if not username:
return True


+ 1
- 1
youtube_dl/extractor/noco.py View File

@ -65,7 +65,7 @@ class NocoIE(InfoExtractor):
self._login()
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/packtpub.py View File

@ -42,7 +42,7 @@ class PacktPubIE(PacktPubBaseIE):
_TOKEN = None
def _real_initialize(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return
try:


+ 1
- 1
youtube_dl/extractor/patreon.py View File

@ -53,7 +53,7 @@ class PatreonIE(InfoExtractor):
# needed. Keeping this commented for when this inevitably changes.
'''
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/pluralsight.py View File

@ -94,7 +94,7 @@ class PluralsightIE(PluralsightBaseIE):
self._login()
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/roosterteeth.py View File

@ -50,7 +50,7 @@ class RoosterTeethIE(InfoExtractor):
}]
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/safari.py View File

@ -27,7 +27,7 @@ class SafariBaseIE(InfoExtractor):
self._login()
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/sina.py View File

@ -64,7 +64,7 @@ class SinaIE(InfoExtractor):
# The video id is in the redirected url
self.to_screen('Getting video id')
request = HEADRequest(url)
(_, urlh) = self._download_webpage_handle(request, 'NA', False)
_, urlh = self._download_webpage_handle(request, 'NA', False)
return self._real_extract(urlh.geturl())
else:
pseudo_id = mobj.group('pseudo_id')


+ 1
- 1
youtube_dl/extractor/tennistv.py View File

@ -32,7 +32,7 @@ class TennisTVIE(InfoExtractor):
_NETRC_MACHINE = 'tennistv'
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if not username or not password:
raise ExtractorError('No login info available, needed for using %s.' % self.IE_NAME, expected=True)


+ 1
- 1
youtube_dl/extractor/tubitv.py View File

@ -36,7 +36,7 @@ class TubiTvIE(InfoExtractor):
}]
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return
self.report_login()


+ 1
- 1
youtube_dl/extractor/tumblr.py View File

@ -108,7 +108,7 @@ class TumblrIE(InfoExtractor):
self._login()
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/twitch.py View File

@ -61,7 +61,7 @@ class TwitchBaseIE(InfoExtractor):
self._login()
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/udemy.py View File

@ -151,7 +151,7 @@ class UdemyIE(InfoExtractor):
self._login()
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/vessel.py View File

@ -75,7 +75,7 @@ class VesselIE(InfoExtractor):
'Access to this content is restricted. (%s said: %s)' % (self.IE_NAME, err_code), expected=True)
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return
self.report_login()


+ 1
- 1
youtube_dl/extractor/viki.py View File

@ -88,7 +88,7 @@ class VikiBaseIE(InfoExtractor):
self._login()
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/vimeo.py View File

@ -37,7 +37,7 @@ class VimeoBaseInfoExtractor(InfoExtractor):
_LOGIN_URL = 'https://vimeo.com/log_in'
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
if self._LOGIN_REQUIRED:
raise ExtractorError('No login info available, needed for using %s.' % self.IE_NAME, expected=True)


+ 1
- 1
youtube_dl/extractor/vk.py View File

@ -32,7 +32,7 @@ class VKBaseIE(InfoExtractor):
_NETRC_MACHINE = 'vk'
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if username is None:
return


+ 1
- 1
youtube_dl/extractor/youtube.py View File

@ -85,7 +85,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
If _LOGIN_REQUIRED is set and no authentication was provided, an error is raised.
"""
(username, password) = self._get_login_info()
username, password = self._get_login_info()
# No authentication to be performed
if username is None:
if self._LOGIN_REQUIRED and self._downloader.params.get('cookiefile') is None:


+ 1
- 1
youtube_dl/extractor/zattoo.py View File

@ -24,7 +24,7 @@ class ZattooBaseIE(InfoExtractor):
_power_guide_hash = None
def _login(self):
(username, password) = self._get_login_info()
username, password = self._get_login_info()
if not username or not password:
self.raise_login_required(
'A valid %s account is needed to access this media.'


Loading…
Cancel
Save