X-Git-Url: https://jfr.im/git/yt-dlp.git/blobdiff_plain/dac4d5be12693693313c60ca71e4eeb7d88a2806..bef9a9e5361fd7a72e21d0f1a8c8afb70d89e8c5:/test/test_compat.py
diff --git a/test/test_compat.py b/test/test_compat.py
index c3ba8ad2e..71ca7f99f 100644
--- a/test/test_compat.py
+++ b/test/test_compat.py
@@ -1,48 +1,47 @@
-#!/usr/bin/env python
-# coding: utf-8
-
-from __future__ import unicode_literals
+#!/usr/bin/env python3
# Allow direct execution
import os
import sys
import unittest
+
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
-from youtube_dl.utils import get_filesystem_encoding
-from youtube_dl.compat import (
- compat_getenv,
+import struct
+
+from yt_dlp import compat
+from yt_dlp.compat import urllib # isort: split
+from yt_dlp.compat import (
+ compat_etree_fromstring,
compat_expanduser,
compat_urllib_parse_unquote,
- compat_urllib_parse_unquote_plus,
+ compat_urllib_parse_urlencode,
)
+from yt_dlp.compat.urllib.request import getproxies
class TestCompat(unittest.TestCase):
- def test_compat_getenv(self):
- test_str = 'ÑеÑÑ'
- os.environ['YOUTUBE-DL-TEST'] = (
- test_str if sys.version_info >= (3, 0)
- else test_str.encode(get_filesystem_encoding()))
- self.assertEqual(compat_getenv('YOUTUBE-DL-TEST'), test_str)
+ def test_compat_passthrough(self):
+ with self.assertWarns(DeprecationWarning):
+ compat.compat_basestring
+
+ with self.assertWarns(DeprecationWarning):
+ compat.WINDOWS_VT_MODE
+
+ self.assertEqual(urllib.request.getproxies, getproxies)
+
+ with self.assertWarns(DeprecationWarning):
+ compat.compat_pycrypto_AES # Must not raise error
def test_compat_expanduser(self):
old_home = os.environ.get('HOME')
- test_str = 'C:\Documents and Settings\ÑеÑÑ\Application Data'
- os.environ['HOME'] = (
- test_str if sys.version_info >= (3, 0)
- else test_str.encode(get_filesystem_encoding()))
- self.assertEqual(compat_expanduser('~'), test_str)
- os.environ['HOME'] = old_home
-
- def test_all_present(self):
- import youtube_dl.compat
- all_names = youtube_dl.compat.__all__
- present_names = set(filter(
- lambda c: '_' in c and not c.startswith('_'),
- dir(youtube_dl.compat))) - set(['unicode_literals'])
- self.assertEqual(all_names, sorted(present_names))
+ test_str = R'C:\Documents and Settings\ÑеÑÑ\Application Data'
+ try:
+ os.environ['HOME'] = test_str
+ self.assertEqual(compat_expanduser('~'), test_str)
+ finally:
+ os.environ['HOME'] = old_home or ''
def test_compat_urllib_parse_unquote(self):
self.assertEqual(compat_urllib_parse_unquote('abc%20def'), 'abc def')
@@ -64,8 +63,43 @@ def test_compat_urllib_parse_unquote(self):
'''(^â£_â¢^)ã£ï¸»ãâä¸ â â â â â â¶%I%Break%Things%''')
def test_compat_urllib_parse_unquote_plus(self):
- self.assertEqual(compat_urllib_parse_unquote_plus('abc%20def'), 'abc def')
- self.assertEqual(compat_urllib_parse_unquote_plus('%7e/abc+def'), '~/abc def')
+ self.assertEqual(urllib.parse.unquote_plus('abc%20def'), 'abc def')
+ self.assertEqual(urllib.parse.unquote_plus('%7e/abc+def'), '~/abc def')
+
+ def test_compat_urllib_parse_urlencode(self):
+ self.assertEqual(compat_urllib_parse_urlencode({'abc': 'def'}), 'abc=def')
+ self.assertEqual(compat_urllib_parse_urlencode({'abc': b'def'}), 'abc=def')
+ self.assertEqual(compat_urllib_parse_urlencode({b'abc': 'def'}), 'abc=def')
+ self.assertEqual(compat_urllib_parse_urlencode({b'abc': b'def'}), 'abc=def')
+ self.assertEqual(compat_urllib_parse_urlencode([('abc', 'def')]), 'abc=def')
+ self.assertEqual(compat_urllib_parse_urlencode([('abc', b'def')]), 'abc=def')
+ self.assertEqual(compat_urllib_parse_urlencode([(b'abc', 'def')]), 'abc=def')
+ self.assertEqual(compat_urllib_parse_urlencode([(b'abc', b'def')]), 'abc=def')
+
+ def test_compat_etree_fromstring(self):
+ xml = '''
+
+ foo
+ ä¸æ
+ spam
+
+ '''
+ doc = compat_etree_fromstring(xml.encode())
+ self.assertTrue(isinstance(doc.attrib['foo'], str))
+ self.assertTrue(isinstance(doc.attrib['spam'], str))
+ self.assertTrue(isinstance(doc.find('normal').text, str))
+ self.assertTrue(isinstance(doc.find('chinese').text, str))
+ self.assertTrue(isinstance(doc.find('foo/bar').text, str))
+
+ def test_compat_etree_fromstring_doctype(self):
+ xml = '''
+
+'''
+ compat_etree_fromstring(xml)
+
+ def test_struct_unpack(self):
+ self.assertEqual(struct.unpack('!B', b'\x00'), (0,))
+
if __name__ == '__main__':
unittest.main()