Update changelog.

[youtubedl] / test / test_write_info_json.py

diff --git a/test/test_write_info_json.py b/test/test_write_info_json.py
index 8134dda371c0e31f57a9fc199452e33808a5702b..d7177611b5e1a90aa3bdf612ae873336ff44d686 100644 (file)
--- a/test/test_write_info_json.py
+++ b/test/test_write_info_json.py
@@ -1,40 +1,36 @@
 #!/usr/bin/env python
 # coding: utf-8
 
 #!/usr/bin/env python
 # coding: utf-8
 

-import json
+# Allow direct execution

 import os
 import sys
 import unittest
 import os
 import sys
 import unittest

+sys.path.insert(0, 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__))))
+from test.helper import get_params

 
 

-import youtube_dl.FileDownloader
-import youtube_dl.InfoExtractors
-from youtube_dl.utils import *

 
 

-PARAMETERS_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), "parameters.json")
+import io
+import json

 
 

-# General configuration (from __init__, not very elegant...)
-jar = compat_cookiejar.CookieJar()
-cookie_processor = compat_urllib_request.HTTPCookieProcessor(jar)
-proxy_handler = compat_urllib_request.ProxyHandler()
-opener = compat_urllib_request.build_opener(proxy_handler, cookie_processor, YoutubeDLHandler())
-compat_urllib_request.install_opener(opener)
+import youtube_dl.YoutubeDL
+import youtube_dl.extractor

 
 

-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
 
         self.to_stderr = self.to_screen
 

-with io.open(PARAMETERS_FILE, encoding='utf-8') as pf:
-    params = json.load(pf)
-params['writeinfojson'] = True
-params['skip_download'] = True
-params['writedescription'] = True
+params = get_params({
+    'writeinfojson': True,
+    'skip_download': True,
+    'writedescription': True,
+})
+

 
 TEST_ID = 'BaW_jenozKc'
 
 TEST_ID = 'BaW_jenozKc'

-INFO_JSON_FILE = TEST_ID + '.mp4.info.json'
+INFO_JSON_FILE = TEST_ID + '.info.json'

 DESCRIPTION_FILE = TEST_ID + '.mp4.description'
 EXPECTED_DESCRIPTION = u'''test chars:  "'/\ä↭𝕐
 
 DESCRIPTION_FILE = TEST_ID + '.mp4.description'
 EXPECTED_DESCRIPTION = u'''test chars:  "'/\ä↭𝕐
 


@@ -42,16 +38,17 @@ This is a test video for youtube-dl.
 
 For more information, contact phihag@phihag.de .'''
 
 
 For more information, contact phihag@phihag.de .'''
 

+

 class TestInfoJSON(unittest.TestCase):
     def setUp(self):
         # Clear old files
         self.tearDown()
 
     def test_info_json(self):
 class TestInfoJSON(unittest.TestCase):
     def setUp(self):
         # Clear old files
         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)