projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[fixup] remove unnecessary commented function
[youtube-dl]
/
test
/
test_write_info_json.py
diff --git
a/test/test_write_info_json.py
b/test/test_write_info_json.py
index 8134dda371c0e31f57a9fc199452e33808a5702b..de6d5180fc0a88a66b747548352fdf72775d7c00 100644
(file)
--- a/
test/test_write_info_json.py
+++ b/
test/test_write_info_json.py
@@
-9,8
+9,8
@@
import unittest
# Allow direct execution
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
# Allow direct execution
sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-import youtube_dl.
FileDownloader
-import youtube_dl.
InfoExtractors
+import youtube_dl.
YoutubeDL
+import youtube_dl.
extractor
from youtube_dl.utils import *
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
from youtube_dl.utils import *
PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
@@
-22,9
+22,9
@@
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
FileDownloader(youtube_dl.FileDownloader
):
+class
YoutubeDL(youtube_dl.YoutubeDL
):
def __init__(self, *args, **kwargs):
def __init__(self, *args, **kwargs):
-
youtube_dl.FileDownloader.__init__(self,
*args, **kwargs)
+
super(YoutubeDL, self).__init__(
*args, **kwargs)
self.to_stderr = self.to_screen
with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
self.to_stderr = self.to_screen
with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
@@
-48,10
+48,10
@@
class TestInfoJSON(unittest.TestCase):
self.tearDown()
def test_info_json(self):
self.tearDown()
def test_info_json(self):
- ie = youtube_dl.
InfoExtractors
.YoutubeIE()
-
fd = FileDownloader
(params)
-
fd
.add_info_extractor(ie)
-
fd
.download([TEST_ID])
+ ie = youtube_dl.
extractor
.YoutubeIE()
+
ydl = YoutubeDL
(params)
+
ydl
.add_info_extractor(ie)
+
ydl
.download([TEST_ID])
self.assertTrue(os.path.exists(INFO_JSON_FILE))
with io.open(INFO_JSON_FILE, 'r', encoding='utf-8') as jsonf:
jd = json.load(jsonf)
self.assertTrue(os.path.exists(INFO_JSON_FILE))
with io.open(INFO_JSON_FILE, 'r', encoding='utf-8') as jsonf:
jd = json.load(jsonf)