Start preparing new release.

[youtubedl] / youtube_dl / extractor / adobepass.py

diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dl/extractor/adobepass.py
index 4d655bd5e1c3a6c4afae98711c3b7a80c5ac58fc..1b2d364cab452da835d7ba8cc78325825c0fcf20 100644 (file)
--- a/youtube_dl/extractor/adobepass.py
+++ b/youtube_dl/extractor/adobepass.py
@@ -36,6 +36,11 @@ MSO_INFO = {
         'username_field': 'Ecom_User_ID',
         'password_field': 'Ecom_Password',
     },
         'username_field': 'Ecom_User_ID',
         'password_field': 'Ecom_Password',
     },

+    'Charter_Direct': {
+        'name': 'Charter Spectrum',
+        'username_field': 'IDToken1',
+        'password_field': 'IDToken2',
+    },

     'thr030': {
         'name': '3 Rivers Communications'
     },
     'thr030': {
         'name': '3 Rivers Communications'
     },


@@ -1453,6 +1458,8 @@ class AdobePassIE(InfoExtractor):
                     self._downloader.cache.store(self._MVPD_CACHE, requestor_id, {})
                     count += 1
                     continue
                     self._downloader.cache.store(self._MVPD_CACHE, requestor_id, {})
                     count += 1
                     continue

+                if '<error' in authorize:
+                    raise ExtractorError(xml_text(authorize, 'details'), expected=True)

                 authz_token = unescapeHTML(xml_text(authorize, 'authzToken'))
                 requestor_info[guid] = authz_token
                 self._downloader.cache.store(self._MVPD_CACHE, requestor_id, requestor_info)
                 authz_token = unescapeHTML(xml_text(authorize, 'authzToken'))
                 requestor_info[guid] = authz_token
                 self._downloader.cache.store(self._MVPD_CACHE, requestor_id, requestor_info)