making the script compatible with python3

diff --git a/Makefile b/Makefile
index e152b00ac2c70ad74f36fa1cd7aa67c8ce6c3856..119c1eeaa08fa2eaaf1e626a5b0860e299f0afd2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion 
+all: youtube-dl README.md README.txt youtube-dl.1 youtube-dl.bash-completion
 
 clean:
        rm -rf youtube-dl youtube-dl.exe youtube-dl.1 youtube-dl.bash-completion README.txt MANIFEST build/ dist/
@@ -38,10 +38,8 @@ README.txt: README.md
 youtube-dl.1: README.md
        pandoc -s -f markdown -t man README.md -o youtube-dl.1
 
-youtube-dl.bash-completion: README.md youtube-dl.bash-completion.in
-       @options=`egrep -o '(--[a-z-]+) ' README.md | sort -u | xargs echo` && \
-               content=`sed "s/opts=\"[^\"]*\"/opts=\"$${options}\"/g" youtube-dl.bash-completion.in` && \
-               echo "$${content}" > youtube-dl.bash-completion
+youtube-dl.bash-completion: README.md devscripts/bash_completion.template
+       python devscripts/bash_completion.py
 
 youtube-dl.tar.gz: all
        tar -czf youtube-dl.tar.gz -s "|^./|./youtube-dl/|" \

diff --git a/devscripts/bash_completion.py b/devscripts/bash_completion.py
index 1cbfa8bec9449b055b35e9257335c3de5e3a2016..704034f2233a067b525dbf40dd2b85e0278dbf46 100644 (file)
--- a/devscripts/bash_completion.py
+++ b/devscripts/bash_completion.py
@@ -1,4 +1,9 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
+import os
+from os.path import dirname as dirn
+import sys
+
+sys.path.append(dirn(dirn((os.path.abspath(__file__)))))
 import youtube_dl
 
 BASH_COMPLETION_FILE = "youtube-dl.bash_completion"
@@ -14,7 +19,6 @@ def build_completion(opt_parser):
         template = f.read()
     with open(BASH_COMPLETION_FILE, "w") as f:
         #just using the special char
-        print opts_flag
         filled_template = template.replace("{{flags}}", " ".join(opts_flag))
         f.write(filled_template)