X-Git-Url: https://jfr.im/git/yt-dlp.git/blobdiff_plain/7a5c1cfe93924351387b44919b3c0b2f66c4b883..6e36d17f404556f0e3a43f441c477a71a91877d9:/test/test_compat.py

diff --git a/test/test_compat.py b/test/test_compat.py
index d903a5bfe..71ca7f99f 100644
--- a/test/test_compat.py
+++ b/test/test_compat.py
@@ -1,80 +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__))))
 
 
+import struct
+
+from yt_dlp import compat
+from yt_dlp.compat import urllib  # isort: split
 from yt_dlp.compat import (
-    compat_getenv,
-    compat_setenv,
-    compat_etree_Element,
     compat_etree_fromstring,
     compat_expanduser,
-    compat_shlex_split,
-    compat_str,
-    compat_struct_unpack,
-    compat_urllib_parse_quote,
-    compat_urllib_parse_quote_plus,
     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 = 'тест'
-        compat_setenv('yt_dlp_COMPAT_GETENV', test_str)
-        self.assertEqual(compat_getenv('yt_dlp_COMPAT_GETENV'), test_str)
-
-    def test_compat_setenv(self):
-        test_var = 'yt_dlp_COMPAT_SETENV'
-        test_str = 'тест'
-        compat_setenv(test_var, test_str)
-        compat_getenv(test_var)
-        self.assertEqual(compat_getenv(test_var), 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 = r'C:\Documents and Settings\тест\Application Data'
-        compat_setenv('HOME', test_str)
-        self.assertEqual(compat_expanduser('~'), test_str)
-        compat_setenv('HOME', old_home or '')
-
-    def test_all_present(self):
-        import yt_dlp.compat
-        all_names = yt_dlp.compat.__all__
-        present_names = set(filter(
-            lambda c: '_' in c and not c.startswith('_'),
-            dir(yt_dlp.compat))) - set(['unicode_literals'])
-        self.assertEqual(all_names, sorted(present_names))
-
-    def test_compat_urllib_parse_quote(self):
-        self.assertEqual(compat_urllib_parse_quote('abc def'), 'abc%20def')
-        self.assertEqual(compat_urllib_parse_quote('/user/abc+def'), '/user/abc%2Bdef')
-        self.assertEqual(compat_urllib_parse_quote('/user/abc+def', safe='+'), '%2Fuser%2Fabc+def')
-        self.assertEqual(compat_urllib_parse_quote(''), '')
-        self.assertEqual(compat_urllib_parse_quote('%'), '%25')
-        self.assertEqual(compat_urllib_parse_quote('%', safe='%'), '%')
-        self.assertEqual(compat_urllib_parse_quote('津波'), '%E6%B4%A5%E6%B3%A2')
-        self.assertEqual(
-            compat_urllib_parse_quote('''<meta property="og:description" content="▁▂▃▄%▅▆▇█" />
-%<a href="https://ar.wikipedia.org/wiki/تسونامي">%a''', safe='<>=":%/ \r\n'),
-            '''<meta property="og:description" content="%E2%96%81%E2%96%82%E2%96%83%E2%96%84%%E2%96%85%E2%96%86%E2%96%87%E2%96%88" />
-%<a href="https://ar.wikipedia.org/wiki/%D8%AA%D8%B3%D9%88%D9%86%D8%A7%D9%85%D9%8A">%a''')
-        self.assertEqual(
-            compat_urllib_parse_quote('''(^◣_◢^)っ︻デ═一    ⇀    ⇀    ⇀    ⇀    ⇀    ↶%I%Break%25Things%''', safe='% '),
-            '''%28%5E%E2%97%A3_%E2%97%A2%5E%29%E3%81%A3%EF%B8%BB%E3%83%87%E2%95%90%E4%B8%80    %E2%87%80    %E2%87%80    %E2%87%80    %E2%87%80    %E2%87%80    %E2%86%B6%I%Break%25Things%''')
-
-    def test_compat_urllib_parse_quote_plus(self):
-        self.assertEqual(compat_urllib_parse_quote_plus('abc def'), 'abc+def')
-        self.assertEqual(compat_urllib_parse_quote_plus('/abc def'), '%2Fabc+def')
+        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')
@@ -96,8 +63,8 @@ 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')
@@ -109,17 +76,6 @@ def test_compat_urllib_parse_urlencode(self):
         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_shlex_split(self):
-        self.assertEqual(compat_shlex_split('-option "one two"'), ['-option', 'one two'])
-        self.assertEqual(compat_shlex_split('-option "one\ntwo" \n -flag'), ['-option', 'one\ntwo', '-flag'])
-        self.assertEqual(compat_shlex_split('-val 中文'), ['-val', '中文'])
-
-    def test_compat_etree_Element(self):
-        try:
-            compat_etree_Element.items
-        except AttributeError:
-            self.fail('compat_etree_Element is not a type')
-
     def test_compat_etree_fromstring(self):
         xml = '''
             <root foo="bar" spam="中文">
@@ -128,12 +84,12 @@ def test_compat_etree_fromstring(self):
                 <foo><bar>spam</bar></foo>
             </root>
         '''
-        doc = compat_etree_fromstring(xml.encode('utf-8'))
-        self.assertTrue(isinstance(doc.attrib['foo'], compat_str))
-        self.assertTrue(isinstance(doc.attrib['spam'], compat_str))
-        self.assertTrue(isinstance(doc.find('normal').text, compat_str))
-        self.assertTrue(isinstance(doc.find('chinese').text, compat_str))
-        self.assertTrue(isinstance(doc.find('foo/bar').text, compat_str))
+        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 = '''<?xml version="1.0"?>
@@ -142,7 +98,7 @@ def test_compat_etree_fromstring_doctype(self):
         compat_etree_fromstring(xml)
 
     def test_struct_unpack(self):
-        self.assertEqual(compat_struct_unpack('!B', b'\x00'), (0,))
+        self.assertEqual(struct.unpack('!B', b'\x00'), (0,))
 
 
 if __name__ == '__main__':