youtube-dl

commit 5712c0f42639cd183b0dfbc51482592e790e99d1
parent 86d68f906e21a6674f9f8676b22a47414b6c9fd2
Author: Remita Amine <remitamine@gmail.com>
Date:   Wed, 14 Sep 2016 16:36:42 +0100

[adobepass] remove unnecessary option

Diffstat:
M
youtube_dl/__init__.py
 | 
3
---
M
youtube_dl/extractor/adobepass.py
 | 
3
+--
M
youtube_dl/options.py
 | 
4
----

3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
@@ -179,8 +179,6 @@ def _real_main(argv=None):
         opts.retries = parse_retries(opts.retries)
     if opts.fragment_retries is not None:
         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:
         numeric_buffersize = FileDownloader.parse_bytes(opts.buffersize)
         if numeric_buffersize is None:
@@ -308,7 +306,6 @@ def _real_main(argv=None):
         'ap_mso_id': opts.ap_mso_id,
         'ap_username': opts.ap_username,
         'ap_password': opts.ap_password,
-        'ap_retries': opts.ap_retries,
         'quiet': (opts.quiet or any_getting or any_printing),
         'no_warnings': opts.no_warnings,
         'forceurl': opts.geturl,
diff --git a/youtube_dl/extractor/adobepass.py b/youtube_dl/extractor/adobepass.py
@@ -83,9 +83,8 @@ class AdobePassIE(InfoExtractor):
         }
 
         guid = xml_text(resource, 'guid')
-        retries = self._downloader.params.get('ap_retries', 3)
         count = 0
-        while count < retries:
+        while count < 2:
             requestor_info = self._downloader.cache.load('mvpd', requestor_id) or {}
             authn_token = requestor_info.get('authn_token')
             if authn_token and is_expired(authn_token, 'simpleTokenExpires'):
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
@@ -368,10 +368,6 @@ def parseOpts(overrideArguments=None):
         '--list-ap-mso-ids',
         action='store_true', dest='list_ap_mso_ids', default=False,
         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.add_option(