Merge tag 'upstream/2017.03.07'

[youtubedl] / devscripts / fish-completion.py

diff --git a/devscripts/fish-completion.py b/devscripts/fish-completion.py
index f4aaf0201f5a43341a0dfa1de3eb1087a293485b..51d19dd33d3bf5c05fc86f3c63e23c00871fda90 100755 (executable)
--- a/devscripts/fish-completion.py
+++ b/devscripts/fish-completion.py
@@ -6,7 +6,7 @@ import os
 from os.path import dirname as dirn
 import sys
 
 from os.path import dirname as dirn
 import sys
 

-sys.path.append(dirn(dirn((os.path.abspath(__file__)))))
+sys.path.insert(0, dirn(dirn((os.path.abspath(__file__)))))

 import youtube_dl
 from youtube_dl.utils import shell_quote
 
 import youtube_dl
 from youtube_dl.utils import shell_quote
 


@@ -23,13 +23,13 @@ EXTRA_ARGS = {
     'batch-file': ['--require-parameter'],
 }
 
     'batch-file': ['--require-parameter'],
 }
 

+

 def build_completion(opt_parser):
     commands = []
 
     for group in opt_parser.option_groups:
         for option in group.option_list:
             long_option = option.get_opt_string().strip('-')
 def build_completion(opt_parser):
     commands = []
 
     for group in opt_parser.option_groups:
         for option in group.option_list:
             long_option = option.get_opt_string().strip('-')

-            help_msg = shell_quote([option.help])

             complete_cmd = ['complete', '--command', 'youtube-dl', '--long-option', long_option]
             if option._short_opts:
                 complete_cmd += ['--short-option', option._short_opts[0].strip('-')]
             complete_cmd = ['complete', '--command', 'youtube-dl', '--long-option', long_option]
             if option._short_opts:
                 complete_cmd += ['--short-option', option._short_opts[0].strip('-')]


@@ -44,5 +44,6 @@ def build_completion(opt_parser):
     with open(FISH_COMPLETION_FILE, 'w') as f:
         f.write(filled_template)
 
     with open(FISH_COMPLETION_FILE, 'w') as f:
         f.write(filled_template)
 

+

 parser = youtube_dl.parseOpts()[0]
 build_completion(parser)
 parser = youtube_dl.parseOpts()[0]
 build_completion(parser)