depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-29 05:32:00 +00:00
Code Issues Releases Wiki Activity

[adobepass] remove unnecessary option

Browse source
This commit is contained in:
Remita Amine 2016-09-14 16:36:42 +01:00
parent 86d68f906e
commit 5712c0f426
3 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
youtube_dl/__init__.py
View file

@ -179,8 +179,6 @@ def _real_main(argv=None):
opts.retries = parse_retries(opts.retries) opts.retries = parse_retries(opts.retries)
if opts.fragment_retries is not None: if opts.fragment_retries is not None:
opts.fragment_retries = parse_retries(opts.fragment_retries) opts.fragment_retries = parse_retries(opts.fragment_retries)
if opts.ap_retries is not None:
opts.ap_retries = parse_retries(opts.ap_retries)
if opts.buffersize is not None: if opts.buffersize is not None:
numeric_buffersize = FileDownloader.parse_bytes(opts.buffersize) numeric_buffersize = FileDownloader.parse_bytes(opts.buffersize)
if numeric_buffersize is None: if numeric_buffersize is None:
@ -308,7 +306,6 @@ def _real_main(argv=None):
'ap_mso_id': opts.ap_mso_id, 'ap_mso_id': opts.ap_mso_id,
'ap_username': opts.ap_username, 'ap_username': opts.ap_username,
'ap_password': opts.ap_password, 'ap_password': opts.ap_password,
'ap_retries': opts.ap_retries,
'quiet': (opts.quiet or any_getting or any_printing), 'quiet': (opts.quiet or any_getting or any_printing),
'no_warnings': opts.no_warnings, 'no_warnings': opts.no_warnings,
'forceurl': opts.geturl, 'forceurl': opts.geturl,

3
youtube_dl/extractor/adobepass.py
View file

@ -83,9 +83,8 @@ class AdobePassIE(InfoExtractor):
} }
guid = xml_text(resource, 'guid') guid = xml_text(resource, 'guid')
retries = self._downloader.params.get('ap_retries', 3)
count = 0 count = 0
while count < retries: while count < 2:
requestor_info = self._downloader.cache.load('mvpd', requestor_id) or {} requestor_info = self._downloader.cache.load('mvpd', requestor_id) or {}
authn_token = requestor_info.get('authn_token') authn_token = requestor_info.get('authn_token')
if authn_token and is_expired(authn_token, 'simpleTokenExpires'): if authn_token and is_expired(authn_token, 'simpleTokenExpires'):

4
youtube_dl/options.py
View file

@ -368,10 +368,6 @@ def parseOpts(overrideArguments=None):
'--list-ap-mso-ids', '--list-ap-mso-ids',
action='store_true', dest='list_ap_mso_ids', default=False, action='store_true', dest='list_ap_mso_ids', default=False,
help='List all supported TV Providers') help='List all supported TV Providers')
adobe_pass.add_option(
'--ap-retries',
dest='ap_retries', metavar='APRETRIES', default=3,
help='Number of retries for Adobe Pass Authorization requests')
video_format = optparse.OptionGroup(parser, 'Video Format Options') video_format = optparse.OptionGroup(parser, 'Video Format Options')
video_format.add_option( video_format.add_option(