commit 87148bb7110ed54ef50f0660dfe0a735cdede3ca
parent 797c636bcb02d1199015b753d26430eec13c4b2b
Author: Remita Amine <remitamine@gmail.com>
Date: Wed, 14 Sep 2016 20:21:09 +0100
[adobepass] rename --ap-mso-list option to --ap-list-mso
Diffstat:
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
@@ -120,7 +120,7 @@ def _real_main(argv=None):
desc += ' (Example: "%s%s:%s" )' % (ie.SEARCH_KEY, random.choice(_COUNTS), random.choice(_SEARCHES))
write_string(desc + '\n', out=sys.stdout)
sys.exit(0)
- if opts.ap_mso_list:
+ if opts.ap_list_mso:
table = [[mso_id, mso_info['name']] for mso_id, mso_info in MSO_INFO.items()]
write_string('Supported TV Providers:\n' + render_table(['mso', 'mso name'], table) + '\n', out=sys.stdout)
sys.exit(0)
@@ -166,7 +166,7 @@ def _real_main(argv=None):
else:
opts.max_sleep_interval = opts.sleep_interval
if opts.ap_mso and opts.ap_mso not in MSO_INFO:
- parser.error('Unsupported TV Provider, use --ap-mso-list to get a list of supported TV Providers')
+ parser.error('Unsupported TV Provider, use --ap-list-mso to get a list of supported TV Providers')
def parse_retries(retries):
if retries in ('inf', 'infinite'):
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
@@ -365,8 +365,8 @@ def parseOpts(overrideArguments=None):
dest='ap_password', metavar='PASSWORD',
help='TV Provider Account password. If this option is left out, youtube-dl will ask interactively.')
adobe_pass.add_option(
- '--ap-mso-list',
- action='store_true', dest='ap_mso_list', default=False,
+ '--ap-list-mso',
+ action='store_true', dest='ap_list_mso', default=False,
help='List all supported TV Providers')
video_format = optparse.OptionGroup(parser, 'Video Format Options')