Merge tag 'upstream/2013.06.33'

[youtubedl] / test / test_youtube_subtitles.py

diff --git a/test/test_youtube_subtitles.py b/test/test_youtube_subtitles.py
index c80c90cbed53f5b5a5fbbbc5f8c7f3e9cb07586b..e8f5e4ae70a85e29c363dafe6417c614a409849e 100644 (file)
--- a/test/test_youtube_subtitles.py
+++ b/test/test_youtube_subtitles.py
@@ -10,9 +10,9 @@ import hashlib
 import os
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 import os
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 

-from youtube_dl.InfoExtractors import YoutubeIE
+from youtube_dl.extractor import YoutubeIE

 from youtube_dl.utils import *
 from youtube_dl.utils import *

-from youtube_dl import FileDownloader
+from youtube_dl import YoutubeDL

 
 PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
 with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
 
 PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
 with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:


@@ -25,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)
 
 opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler())
 compat_urllib_request.install_opener(opener)
 

-class FakeDownloader(FileDownloader):
+class FakeYDL(YoutubeDL):

     def __init__(self):
         self.result = []
         # Different instances of the downloader can't share the same dictionary
     def __init__(self):
         self.result = []
         # Different instances of the downloader can't share the same dictionary


@@ -42,27 +42,27 @@ md5 = lambda s: hashlib.md5(s.encode('utf-8')).hexdigest()
 
 class TestYoutubeSubtitles(unittest.TestCase):
     def setUp(self):
 
 class TestYoutubeSubtitles(unittest.TestCase):
     def setUp(self):

-        DL = FakeDownloader()
+        DL = FakeYDL()

         DL.params['allsubtitles'] = False
         DL.params['writesubtitles'] = False
         DL.params['subtitlesformat'] = 'srt'
         DL.params['listsubtitles'] = False
     def test_youtube_no_subtitles(self):
         DL.params['allsubtitles'] = False
         DL.params['writesubtitles'] = False
         DL.params['subtitlesformat'] = 'srt'
         DL.params['listsubtitles'] = False
     def test_youtube_no_subtitles(self):

-        DL = FakeDownloader()
+        DL = FakeYDL()

         DL.params['writesubtitles'] = False
         IE = YoutubeIE(DL)
         info_dict = IE.extract('QRS8MkLhQmM')
         subtitles = info_dict[0]['subtitles']
         self.assertEqual(subtitles, None)
     def test_youtube_subtitles(self):
         DL.params['writesubtitles'] = False
         IE = YoutubeIE(DL)
         info_dict = IE.extract('QRS8MkLhQmM')
         subtitles = info_dict[0]['subtitles']
         self.assertEqual(subtitles, None)
     def test_youtube_subtitles(self):

-        DL = FakeDownloader()
+        DL = FakeYDL()

         DL.params['writesubtitles'] = True
         IE = YoutubeIE(DL)
         info_dict = IE.extract('QRS8MkLhQmM')
         sub = info_dict[0]['subtitles'][0]
         self.assertEqual(md5(sub[2]), '4cd9278a35ba2305f47354ee13472260')
     def test_youtube_subtitles_it(self):
         DL.params['writesubtitles'] = True
         IE = YoutubeIE(DL)
         info_dict = IE.extract('QRS8MkLhQmM')
         sub = info_dict[0]['subtitles'][0]
         self.assertEqual(md5(sub[2]), '4cd9278a35ba2305f47354ee13472260')
     def test_youtube_subtitles_it(self):

-        DL = FakeDownloader()
+        DL = FakeYDL()

         DL.params['writesubtitles'] = True
         DL.params['subtitleslang'] = 'it'
         IE = YoutubeIE(DL)
         DL.params['writesubtitles'] = True
         DL.params['subtitleslang'] = 'it'
         IE = YoutubeIE(DL)


@@ -70,7 +70,7 @@ class TestYoutubeSubtitles(unittest.TestCase):
         sub = info_dict[0]['subtitles'][0]
         self.assertEqual(md5(sub[2]), '164a51f16f260476a05b50fe4c2f161d')
     def test_youtube_onlysubtitles(self):
         sub = info_dict[0]['subtitles'][0]
         self.assertEqual(md5(sub[2]), '164a51f16f260476a05b50fe4c2f161d')
     def test_youtube_onlysubtitles(self):

-        DL = FakeDownloader()
+        DL = FakeYDL()

         DL.params['writesubtitles'] = True
         DL.params['onlysubtitles'] = True
         IE = YoutubeIE(DL)
         DL.params['writesubtitles'] = True
         DL.params['onlysubtitles'] = True
         IE = YoutubeIE(DL)


@@ -78,14 +78,14 @@ class TestYoutubeSubtitles(unittest.TestCase):
         sub = info_dict[0]['subtitles'][0]
         self.assertEqual(md5(sub[2]), '4cd9278a35ba2305f47354ee13472260')
     def test_youtube_allsubtitles(self):
         sub = info_dict[0]['subtitles'][0]
         self.assertEqual(md5(sub[2]), '4cd9278a35ba2305f47354ee13472260')
     def test_youtube_allsubtitles(self):

-        DL = FakeDownloader()
+        DL = FakeYDL()

         DL.params['allsubtitles'] = True
         IE = YoutubeIE(DL)
         info_dict = IE.extract('QRS8MkLhQmM')
         subtitles = info_dict[0]['subtitles']
         self.assertEqual(len(subtitles), 13)
     def test_youtube_subtitles_format(self):
         DL.params['allsubtitles'] = True
         IE = YoutubeIE(DL)
         info_dict = IE.extract('QRS8MkLhQmM')
         subtitles = info_dict[0]['subtitles']
         self.assertEqual(len(subtitles), 13)
     def test_youtube_subtitles_format(self):

-        DL = FakeDownloader()
+        DL = FakeYDL()

         DL.params['writesubtitles'] = True
         DL.params['subtitlesformat'] = 'sbv'
         IE = YoutubeIE(DL)
         DL.params['writesubtitles'] = True
         DL.params['subtitlesformat'] = 'sbv'
         IE = YoutubeIE(DL)


@@ -93,13 +93,13 @@ class TestYoutubeSubtitles(unittest.TestCase):
         sub = info_dict[0]['subtitles'][0]
         self.assertEqual(md5(sub[2]), '13aeaa0c245a8bed9a451cb643e3ad8b')
     def test_youtube_list_subtitles(self):
         sub = info_dict[0]['subtitles'][0]
         self.assertEqual(md5(sub[2]), '13aeaa0c245a8bed9a451cb643e3ad8b')
     def test_youtube_list_subtitles(self):

-        DL = FakeDownloader()
+        DL = FakeYDL()

         DL.params['listsubtitles'] = True
         IE = YoutubeIE(DL)
         info_dict = IE.extract('QRS8MkLhQmM')
         self.assertEqual(info_dict, None)
     def test_youtube_automatic_captions(self):
         DL.params['listsubtitles'] = True
         IE = YoutubeIE(DL)
         info_dict = IE.extract('QRS8MkLhQmM')
         self.assertEqual(info_dict, None)
     def test_youtube_automatic_captions(self):

-        DL = FakeDownloader()
+        DL = FakeYDL()

         DL.params['writesubtitles'] = True
         DL.params['subtitleslang'] = 'it'
         IE = YoutubeIE(DL)
         DL.params['writesubtitles'] = True
         DL.params['subtitleslang'] = 'it'
         IE = YoutubeIE(DL)