X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=test%2Ftest_compat.py;h=b6bfad05e3c85c07854cc00c337a12caf493e849;hb=896c7a23cd9fbfc589f26e9a7bbada38a325e2ad;hp=431e6bdf186228324ad947b4670c86ef919f63ad;hpb=4a632911443f0dbc2384fb82ade85382aeecc8dc;p=youtube-dl.git
diff --git a/test/test_compat.py b/test/test_compat.py
index 431e6bdf1..b6bfad05e 100644
--- a/test/test_compat.py
+++ b/test/test_compat.py
@@ -13,8 +13,12 @@ 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,
+ compat_etree_fromstring,
compat_expanduser,
+ compat_shlex_split,
+ compat_str,
compat_urllib_parse_unquote,
+ compat_urllib_parse_unquote_plus,
)
@@ -44,23 +48,45 @@ class TestCompat(unittest.TestCase):
self.assertEqual(all_names, sorted(present_names))
def test_compat_urllib_parse_unquote(self):
- test_strings = [
- ['''''', ''''''],
- ['''津波''', '''%E6%B4%A5%E6%B3%A2'''],
- ['''津波''', str('%E6%B4%A5%E6%B3%A2')],
- ['''
-%%a''',
- '''
-%%a'''],
- ['''(^â£_â¢^)ã£ï¸»ãâä¸ â â â â â â¶%I%Break%Things%''',
- '''%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%''']
- ]
- for test in test_strings:
- strutf = test[0]
- strurlenc = test[1]
- strurldec = compat_urllib_parse_unquote(strurlenc)
- self.assertEqual(strutf, strurldec)
- self.assertEqual(strutf, compat_urllib_parse_unquote(strurlenc))
+ self.assertEqual(compat_urllib_parse_unquote('abc%20def'), 'abc def')
+ self.assertEqual(compat_urllib_parse_unquote('%7e/abc+def'), '~/abc+def')
+ self.assertEqual(compat_urllib_parse_unquote(''), '')
+ self.assertEqual(compat_urllib_parse_unquote('%'), '%')
+ self.assertEqual(compat_urllib_parse_unquote('%%'), '%%')
+ self.assertEqual(compat_urllib_parse_unquote('%%%'), '%%%')
+ self.assertEqual(compat_urllib_parse_unquote('%2F'), '/')
+ self.assertEqual(compat_urllib_parse_unquote('%2f'), '/')
+ self.assertEqual(compat_urllib_parse_unquote('%E6%B4%A5%E6%B3%A2'), '津波')
+ self.assertEqual(
+ compat_urllib_parse_unquote('''
+%%a'''),
+ '''
+%%a''')
+ self.assertEqual(
+ compat_urllib_parse_unquote('''%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%'''),
+ '''(^â£_â¢^)ã£ï¸»ãâä¸ â â â â â â¶%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')
+
+ def test_compat_shlex_split(self):
+ self.assertEqual(compat_shlex_split('-option "one two"'), ['-option', 'one two'])
+
+ def test_compat_etree_fromstring(self):
+ xml = '''
+
+ foo
+ ä¸æ
+ spam
+
+ '''
+ 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))
if __name__ == '__main__':
unittest.main()