Upstream/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-15 21:57:53 +01:00
Code Issues Projects Releases Wiki Activity

[extractor/common] Simplify _get_netrc_login_info and carry long lines

Browse Source
This commit is contained in:
Sergey M․ 2016-09-15 22:35:12 +07:00
parent 32443dd346
commit dcce092e0a
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
youtube_dl/extractor/common.py
View File

@ -674,11 +674,13 @@ class InfoExtractor(object):
username = info[0] username = info[0]
password = info[2] password = info[2]
else: else:
raise netrc.NetrcParseError('No authenticators for %s' % netrc_machine) raise netrc.NetrcParseError(
'No authenticators for %s' % netrc_machine)
except (IOError, netrc.NetrcParseError) as err: except (IOError, netrc.NetrcParseError) as err:
self._downloader.report_warning('parsing .netrc: %s' % error_to_compat_str(err)) self._downloader.report_warning(
'parsing .netrc: %s' % error_to_compat_str(err))
return (username, password) return username, password
def _get_login_info(self, username_option='username', password_option='password', netrc_machine=None): def _get_login_info(self, username_option='username', password_option='password', netrc_machine=None):
""" """