From: Yen Chi Hsuan Date: Thu, 7 Jul 2016 14:30:58 +0000 (+0800) Subject: [compat] Fix test_cmdline_umlauts on Python 2.6 X-Git-Url: http://git.oshgnacknak.de/?a=commitdiff_plain;h=ec3518725b2d33c2bd664a965ead007e000dec37;p=youtube-dl [compat] Fix test_cmdline_umlauts on Python 2.6 The original statement raises uncaught UnicodeWarning on Python 2.6 --- diff --git a/youtube_dl/compat.py b/youtube_dl/compat.py index 83b96d38f..b8aaf5a46 100644 --- a/youtube_dl/compat.py +++ b/youtube_dl/compat.py @@ -2596,9 +2596,12 @@ except ImportError: # Python < 3.3 try: - assert shlex.split('中文') == ['中文'] + args = shlex.split('中文') + assert (isinstance(args, list) and + isinstance(args[0], compat_str) and + args[0] == '中文') compat_shlex_split = shlex.split -except (AssertionError, UnicodeWarning, UnicodeEncodeError): +except (AssertionError, UnicodeEncodeError): # Working around shlex issue with unicode strings on some python 2 # versions (see http://bugs.python.org/issue1548891) def compat_shlex_split(s, comments=False, posix=True):