summary refs log tree commit diff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2013-05-10 09:21:24 +0200
committerPhilipp Hagemeister <phihag@phihag.de>2013-05-10 09:21:24 +0200
commit86fd453ea8f9b65f6b1aded22ccc802292159cf3 (patch)
tree4c5d2343d6d0623262f192a76584a32b2a768715
parentc83411b9eefffbdc85c58c6ba7693c66896df7f7 (diff)
parent057c9938a157bbf370097f60b37793ae94d2c411 (diff)
downloadyoutube-dl-86fd453ea8f9b65f6b1aded22ccc802292159cf3.tar.gz
youtube-dl-86fd453ea8f9b65f6b1aded22ccc802292159cf3.tar.xz
youtube-dl-86fd453ea8f9b65f6b1aded22ccc802292159cf3.zip
Merge remote-tracking branch 'origin/master'
-rw-r--r--test/test_youtube_subtitles.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/test_youtube_subtitles.py b/test/test_youtube_subtitles.py
index 5b3f289af..a123e6d72 100644
--- a/test/test_youtube_subtitles.py
+++ b/test/test_youtube_subtitles.py
@@ -12,6 +12,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from youtube_dl.InfoExtractors import YoutubeIE
 from youtube_dl.utils import *
+from youtube_dl import FileDownloader
 
 PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
 with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
@@ -24,7 +25,7 @@ proxy_handler = compat_urllib_request.ProxyHandler()
 opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler())
 compat_urllib_request.install_opener(opener)
 
-class FakeDownloader(object):
+class FakeDownloader(FileDownloader):
     def __init__(self):
         self.result = []
         self.params = parameters