Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
phihag committed May 10, 2013
2 parents c83411b + 057c993 commit 86fd453
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion test/test_youtube_subtitles.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

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:
Expand All @@ -24,7 +25,7 @@
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
Expand Down

0 comments on commit 86fd453

Please sign in to comment.