youtube-dl

commit 92d5477d84c6663e71d6d22e261753a16b78000f
parent 8790249c6860374b4d7eeeffae9e7b30d346eaf7
Author: Yen Chi Hsuan <yan12125@gmail.com>
Date:   Wed,  6 Apr 2016 18:29:54 +0800

[compat] Handle tuples properly in urlencode()

Fixes #9055

Diffstat:
M
test/test_compat.py
 | 
4
++++
M
youtube_dl/compat.py
 | 
3
++-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/test/test_compat.py b/test/test_compat.py
@@ -76,6 +76,10 @@ class TestCompat(unittest.TestCase):
         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_shlex_split(self):
         self.assertEqual(compat_shlex_split('-option "one two"'), ['-option', 'one two'])
diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py
@@ -181,7 +181,8 @@ except ImportError:  # Python 2
             if isinstance(e, dict):
                 e = encode_dict(e)
             elif isinstance(e, (list, tuple,)):
-                e = encode_list(e)
+                list_e = encode_list(e)
+                e = tuple(list_e) if isinstance(e, tuple) else list_e
             elif isinstance(e, compat_str):
                 e = e.encode(encoding)
             return e