diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-07-07 22:30:58 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-07-07 22:30:58 +0800 |
| commit | ec3518725b2d33c2bd664a965ead007e000dec37 (patch) | |
| tree | f6df52be1e1136af46bd61b9ab4e78aaea294b9f /youtube_dl | |
| parent | 5f87d845eb87ba07d5e9fca1fb00a9bb8b7f2f2a (diff) | |
[compat] Fix test_cmdline_umlauts on Python 2.6
The original statement raises uncaught UnicodeWarning on Python 2.6
Diffstat (limited to 'youtube_dl')
| -rw-r--r-- | youtube_dl/compat.py | 7 |
1 files changed, 5 insertions, 2 deletions
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): |