[adobepass] remove unnecessary option

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 052f20ee7dfccbaa9aae091614fb09a6eef9998d..cdff3df65e3714b9c733a22f5dee670f4ebfe580 100644 (file)
--- 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
index 9add6c0f89233412bf0a5cc3f7068c5bf8489b1b..913a817d2e46502209308c865191a5122dc22af8 100644 (file)
--- 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
index b99201a20920295a4c2965762c3f7cbe9d2acb27..342ae3be39d7c8a51aea6c8ab4d924635f11fe00 100644 (file)
--- 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(