remove unnecessary assignment parenthesis
This commit is contained in:
		
							parent
							
								
									ec2f3d2800
								
							
						
					
					
						commit
						68217024e8
					
				
					 33 changed files with 32 additions and 42 deletions
				
			
		| 
						 | 
					@ -52,7 +52,7 @@ class AnimeOnDemandIE(InfoExtractor):
 | 
				
			||||||
    }]
 | 
					    }]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -74,7 +74,7 @@ class AtresPlayerIE(InfoExtractor):
 | 
				
			||||||
        self._login()
 | 
					        self._login()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -44,7 +44,7 @@ class BambuserIE(InfoExtractor):
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -49,7 +49,7 @@ class CrunchyrollBaseIE(InfoExtractor):
 | 
				
			||||||
            })
 | 
					            })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -35,7 +35,7 @@ class CuriosityStreamBaseIE(InfoExtractor):
 | 
				
			||||||
        return result['data']
 | 
					        return result['data']
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _real_initialize(self):
 | 
					    def _real_initialize(self):
 | 
				
			||||||
        (email, password) = self._get_login_info()
 | 
					        email, password = self._get_login_info()
 | 
				
			||||||
        if email is None:
 | 
					        if email is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
        result = self._download_json(
 | 
					        result = self._download_json(
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -42,7 +42,7 @@ class DramaFeverBaseIE(InfoExtractor):
 | 
				
			||||||
        self._login()
 | 
					        self._login()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -226,7 +226,7 @@ class FacebookIE(InfoExtractor):
 | 
				
			||||||
        return urls
 | 
					        return urls
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (useremail, password) = self._get_login_info()
 | 
					        useremail, password = self._get_login_info()
 | 
				
			||||||
        if useremail is None:
 | 
					        if useremail is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -46,7 +46,7 @@ class FC2IE(InfoExtractor):
 | 
				
			||||||
    }]
 | 
					    }]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None or password is None:
 | 
					        if username is None or password is None:
 | 
				
			||||||
            return False
 | 
					            return False
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -51,7 +51,7 @@ class FunimationIE(InfoExtractor):
 | 
				
			||||||
    }]
 | 
					    }]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -91,7 +91,7 @@ class GDCVaultIE(InfoExtractor):
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self, webpage_url, display_id):
 | 
					    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:
 | 
					        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.')
 | 
					            self.report_warning('It looks like ' + webpage_url + ' requires a login. Try specifying a username and password and try again.')
 | 
				
			||||||
            return None
 | 
					            return None
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -23,7 +23,6 @@ from ..utils import (
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class GloboIE(InfoExtractor):
 | 
					class GloboIE(InfoExtractor):
 | 
				
			||||||
    _VALID_URL = r'(?:globo:|https?://.+?\.globo\.com/(?:[^/]+/)*(?:v/(?:[^/]+/)?|videos/))(?P<id>\d{7,})'
 | 
					    _VALID_URL = r'(?:globo:|https?://.+?\.globo\.com/(?:[^/]+/)*(?:v/(?:[^/]+/)?|videos/))(?P<id>\d{7,})'
 | 
				
			||||||
    _LOGGED_IN = False
 | 
					 | 
				
			||||||
    _NETRC_MACHINE = 'globo'
 | 
					    _NETRC_MACHINE = 'globo'
 | 
				
			||||||
    _TESTS = [{
 | 
					    _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/',
 | 
					        '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):
 | 
					    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:
 | 
					        if email is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
| 
						 | 
					@ -91,7 +87,6 @@ class GloboIE(InfoExtractor):
 | 
				
			||||||
                resp = self._parse_json(e.cause.read(), None)
 | 
					                resp = self._parse_json(e.cause.read(), None)
 | 
				
			||||||
                raise ExtractorError(resp.get('userMessage') or resp['id'], expected=True)
 | 
					                raise ExtractorError(resp.get('userMessage') or resp['id'], expected=True)
 | 
				
			||||||
            raise
 | 
					            raise
 | 
				
			||||||
        self._LOGGED_IN = True
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _real_extract(self, url):
 | 
					    def _real_extract(self, url):
 | 
				
			||||||
        video_id = self._match_id(url)
 | 
					        video_id = self._match_id(url)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -18,7 +18,6 @@ class HiDiveIE(InfoExtractor):
 | 
				
			||||||
    # so disabling geo bypass completely
 | 
					    # so disabling geo bypass completely
 | 
				
			||||||
    _GEO_BYPASS = False
 | 
					    _GEO_BYPASS = False
 | 
				
			||||||
    _NETRC_MACHINE = 'hidive'
 | 
					    _NETRC_MACHINE = 'hidive'
 | 
				
			||||||
    _LOGGED_IN = False
 | 
					 | 
				
			||||||
    _LOGIN_URL = 'https://www.hidive.com/account/login'
 | 
					    _LOGIN_URL = 'https://www.hidive.com/account/login'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    _TESTS = [{
 | 
					    _TESTS = [{
 | 
				
			||||||
| 
						 | 
					@ -38,10 +37,7 @@ class HiDiveIE(InfoExtractor):
 | 
				
			||||||
    }]
 | 
					    }]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _real_initialize(self):
 | 
					    def _real_initialize(self):
 | 
				
			||||||
        if self._LOGGED_IN:
 | 
					        email, password = self._get_login_info()
 | 
				
			||||||
            return
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        (email, password) = self._get_login_info()
 | 
					 | 
				
			||||||
        if email is None:
 | 
					        if email is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -56,7 +52,6 @@ class HiDiveIE(InfoExtractor):
 | 
				
			||||||
        })
 | 
					        })
 | 
				
			||||||
        self._download_webpage(
 | 
					        self._download_webpage(
 | 
				
			||||||
            self._LOGIN_URL, None, 'Logging in', data=urlencode_postdata(data))
 | 
					            self._LOGIN_URL, None, 'Logging in', data=urlencode_postdata(data))
 | 
				
			||||||
        self._LOGGED_IN = True
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _real_extract(self, url):
 | 
					    def _real_extract(self, url):
 | 
				
			||||||
        mobj = re.match(self._VALID_URL, url)
 | 
					        mobj = re.match(self._VALID_URL, url)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -66,7 +66,7 @@ class HRTiBaseIE(InfoExtractor):
 | 
				
			||||||
        self._logout_url = modules['user']['resources']['logout']['uri']
 | 
					        self._logout_url = modules['user']['resources']['logout']['uri']
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        # TODO: figure out authentication with cookies
 | 
					        # TODO: figure out authentication with cookies
 | 
				
			||||||
        if username is None or password is None:
 | 
					        if username is None or password is None:
 | 
				
			||||||
            self.raise_login_required()
 | 
					            self.raise_login_required()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -239,7 +239,7 @@ class IqiyiIE(InfoExtractor):
 | 
				
			||||||
        return ohdave_rsa_encrypt(data, e, N)
 | 
					        return ohdave_rsa_encrypt(data, e, N)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # No authentication to be performed
 | 
					        # No authentication to be performed
 | 
				
			||||||
        if not username:
 | 
					        if not username:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -163,7 +163,7 @@ class NiconicoIE(InfoExtractor):
 | 
				
			||||||
        self._login()
 | 
					        self._login()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        # No authentication to be performed
 | 
					        # No authentication to be performed
 | 
				
			||||||
        if not username:
 | 
					        if not username:
 | 
				
			||||||
            return True
 | 
					            return True
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -65,7 +65,7 @@ class NocoIE(InfoExtractor):
 | 
				
			||||||
        self._login()
 | 
					        self._login()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -42,7 +42,7 @@ class PacktPubIE(PacktPubBaseIE):
 | 
				
			||||||
    _TOKEN = None
 | 
					    _TOKEN = None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _real_initialize(self):
 | 
					    def _real_initialize(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -53,7 +53,7 @@ class PatreonIE(InfoExtractor):
 | 
				
			||||||
    # needed. Keeping this commented for when this inevitably changes.
 | 
					    # needed. Keeping this commented for when this inevitably changes.
 | 
				
			||||||
    '''
 | 
					    '''
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -94,7 +94,7 @@ class PluralsightIE(PluralsightBaseIE):
 | 
				
			||||||
        self._login()
 | 
					        self._login()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -50,7 +50,7 @@ class RoosterTeethIE(InfoExtractor):
 | 
				
			||||||
    }]
 | 
					    }]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -27,7 +27,7 @@ class SafariBaseIE(InfoExtractor):
 | 
				
			||||||
        self._login()
 | 
					        self._login()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -64,7 +64,7 @@ class SinaIE(InfoExtractor):
 | 
				
			||||||
                # The video id is in the redirected url
 | 
					                # The video id is in the redirected url
 | 
				
			||||||
                self.to_screen('Getting video id')
 | 
					                self.to_screen('Getting video id')
 | 
				
			||||||
                request = HEADRequest(url)
 | 
					                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())
 | 
					                return self._real_extract(urlh.geturl())
 | 
				
			||||||
            else:
 | 
					            else:
 | 
				
			||||||
                pseudo_id = mobj.group('pseudo_id')
 | 
					                pseudo_id = mobj.group('pseudo_id')
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,7 +32,7 @@ class TennisTVIE(InfoExtractor):
 | 
				
			||||||
    _NETRC_MACHINE = 'tennistv'
 | 
					    _NETRC_MACHINE = 'tennistv'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if not username or not password:
 | 
					        if not username or not password:
 | 
				
			||||||
            raise ExtractorError('No login info available, needed for using %s.' % self.IE_NAME, expected=True)
 | 
					            raise ExtractorError('No login info available, needed for using %s.' % self.IE_NAME, expected=True)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -36,7 +36,7 @@ class TubiTvIE(InfoExtractor):
 | 
				
			||||||
    }]
 | 
					    }]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
        self.report_login()
 | 
					        self.report_login()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -108,7 +108,7 @@ class TumblrIE(InfoExtractor):
 | 
				
			||||||
        self._login()
 | 
					        self._login()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -61,7 +61,7 @@ class TwitchBaseIE(InfoExtractor):
 | 
				
			||||||
        self._login()
 | 
					        self._login()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -151,7 +151,7 @@ class UdemyIE(InfoExtractor):
 | 
				
			||||||
        self._login()
 | 
					        self._login()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -75,7 +75,7 @@ class VesselIE(InfoExtractor):
 | 
				
			||||||
                    'Access to this content is restricted. (%s said: %s)' % (self.IE_NAME, err_code), expected=True)
 | 
					                    'Access to this content is restricted. (%s said: %s)' % (self.IE_NAME, err_code), expected=True)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
        self.report_login()
 | 
					        self.report_login()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -88,7 +88,7 @@ class VikiBaseIE(InfoExtractor):
 | 
				
			||||||
        self._login()
 | 
					        self._login()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -37,7 +37,7 @@ class VimeoBaseInfoExtractor(InfoExtractor):
 | 
				
			||||||
    _LOGIN_URL = 'https://vimeo.com/log_in'
 | 
					    _LOGIN_URL = 'https://vimeo.com/log_in'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            if self._LOGIN_REQUIRED:
 | 
					            if self._LOGIN_REQUIRED:
 | 
				
			||||||
                raise ExtractorError('No login info available, needed for using %s.' % self.IE_NAME, expected=True)
 | 
					                raise ExtractorError('No login info available, needed for using %s.' % self.IE_NAME, expected=True)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,7 +32,7 @@ class VKBaseIE(InfoExtractor):
 | 
				
			||||||
    _NETRC_MACHINE = 'vk'
 | 
					    _NETRC_MACHINE = 'vk'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            return
 | 
					            return
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -85,7 +85,7 @@ class YoutubeBaseInfoExtractor(InfoExtractor):
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        If _LOGIN_REQUIRED is set and no authentication was provided, an error is raised.
 | 
					        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
 | 
					        # No authentication to be performed
 | 
				
			||||||
        if username is None:
 | 
					        if username is None:
 | 
				
			||||||
            if self._LOGIN_REQUIRED and self._downloader.params.get('cookiefile') is None:
 | 
					            if self._LOGIN_REQUIRED and self._downloader.params.get('cookiefile') is None:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -24,7 +24,7 @@ class ZattooBaseIE(InfoExtractor):
 | 
				
			||||||
    _power_guide_hash = None
 | 
					    _power_guide_hash = None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _login(self):
 | 
					    def _login(self):
 | 
				
			||||||
        (username, password) = self._get_login_info()
 | 
					        username, password = self._get_login_info()
 | 
				
			||||||
        if not username or not password:
 | 
					        if not username or not password:
 | 
				
			||||||
            self.raise_login_required(
 | 
					            self.raise_login_required(
 | 
				
			||||||
                'A valid %s account is needed to access this media.'
 | 
					                'A valid %s account is needed to access this media.'
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue