aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor/adobepass.py
diff options
context:
space:
mode:
authorRemita Amine <remitamine@gmail.com>2016-09-14 18:58:47 +0100
committerRemita Amine <remitamine@gmail.com>2016-09-14 18:58:47 +0100
commit797c636bcb02d1199015b753d26430eec13c4b2b (patch)
tree01aa11e8053bd489dd6085e4c255bab1a355eca5 /youtube_dl/extractor/adobepass.py
parent0002962f3feb86ec8c14429af7ecddc17815fa93 (diff)
[ap] improve adobe pass names and parse error handling
Diffstat (limited to 'youtube_dl/extractor/adobepass.py')
-rw-r--r--youtube_dl/extractor/adobepass.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dl/extractor/adobepass.py
index 913a817d2..8ef5a96ce 100644
--- a/youtube_dl/extractor/adobepass.py
+++ b/youtube_dl/extractor/adobepass.py
@@ -72,8 +72,8 @@ class AdobePassIE(InfoExtractor):
def raise_mvpd_required():
raise ExtractorError(
'This video is only available for users of participating TV providers. '
- 'Use --ap-mso-id to specify Adobe Pass Multiple-system operator Identifier '
- 'and --netrc to provide account credentials.', expected=True)
+ 'Use --ap-mso to specify Adobe Pass Multiple-system operator Identifier '
+ 'and --ap-username and --ap-password or --netrc to provide account credentials.', expected=True)
mvpd_headers = {
'ap_42': 'anonymous',
@@ -91,12 +91,9 @@ class AdobePassIE(InfoExtractor):
authn_token = None
if not authn_token:
# TODO add support for other TV Providers
- mso_id = self._downloader.params.get('ap_mso_id')
+ mso_id = self._downloader.params.get('ap_mso')
if not mso_id:
raise_mvpd_required()
- if mso_id not in MSO_INFO:
- raise ExtractorError(
- 'Unsupported TV Provider, use --list-ap-mso-ids to get a list of supported TV Providers' % mso_id, expected=True)
username, password = self._get_login_info('ap_username', 'ap_password', mso_id)
if not username or not password:
raise_mvpd_required()