From: Sergey M․ Date: Thu, 15 Sep 2016 15:26:37 +0000 (+0700) Subject: [extractor/common] Simplify _get_login_info X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=2133565cec3646680600d314b93e535f6fa52339;p=youtube-dl [extractor/common] Simplify _get_login_info --- diff --git a/youtube_dl/extractor/common.py b/youtube_dl/extractor/common.py index e413799f9..9627816b4 100644 --- a/youtube_dl/extractor/common.py +++ b/youtube_dl/extractor/common.py @@ -689,8 +689,6 @@ class InfoExtractor(object): if self._downloader is None: return (None, None) - username = None - password = None downloader_params = self._downloader.params # Attempt to use provided username and password or .netrc data @@ -700,7 +698,7 @@ class InfoExtractor(object): else: username, password = self._get_netrc_login_info(netrc_machine) - return (username, password) + return username, password def _get_tfa_info(self, note='two-factor verification code'): """