[cleanup] Misc cleanup and refactor (#2173)

[yt-dlp.git] / test / test_compat.py

diff --git a/test/test_compat.py b/test/test_compat.py
index 8c49a001e5eabe6d058af188e1b566f7e3d58474..29e7384f049631c032b044ba118a8f1a3c199abc 100644 (file)
--- a/test/test_compat.py
+++ b/test/test_compat.py
@@ -1,22 +1,17 @@
-#!/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_dlc.compat import (
-    compat_getenv,
-    compat_setenv,
-    compat_etree_Element,
+from yt_dlp.compat import (
     compat_etree_fromstring,
     compat_expanduser,
-    compat_shlex_split,
+    compat_getenv,
+    compat_setenv,
     compat_str,
     compat_struct_unpack,
     compat_urllib_parse_unquote,
@@ -28,11 +23,11 @@
 class TestCompat(unittest.TestCase):
     def test_compat_getenv(self):
         test_str = 'тест'
-        compat_setenv('youtube_dlc_COMPAT_GETENV', test_str)
-        self.assertEqual(compat_getenv('youtube_dlc_COMPAT_GETENV'), 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 = 'youtube_dlc_COMPAT_SETENV'
+        test_var = 'yt_dlp_COMPAT_SETENV'
         test_str = 'тест'
         compat_setenv(test_var, test_str)
         compat_getenv(test_var)
@@ -40,17 +35,19 @@ def test_compat_setenv(self):
 
     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 '')
+        test_str = R'C:\Documents and Settings\тест\Application Data'
+        try:
+            compat_setenv('HOME', test_str)
+            self.assertEqual(compat_expanduser('~'), test_str)
+        finally:
+            compat_setenv('HOME', old_home or '')
 
     def test_all_present(self):
-        import youtube_dlc.compat
-        all_names = youtube_dlc.compat.__all__
+        import yt_dlp.compat
+        all_names = yt_dlp.compat.__all__
         present_names = set(filter(
             lambda c: '_' in c and not c.startswith('_'),
-            dir(youtube_dlc.compat))) - set(['unicode_literals'])
+            dir(yt_dlp.compat))) - {'unicode_literals'}
         self.assertEqual(all_names, sorted(present_names))
 
     def test_compat_urllib_parse_unquote(self):
@@ -86,17 +83,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="中文">