w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[compat] Fix test_cmdline_umlauts on Python 2.6

Browse source 
The original statement raises uncaught UnicodeWarning on Python 2.6
This commit is contained in:
Yen Chi Hsuan 2016-07-07 22:30:58 +08:00
parent 5f87d845eb
commit ec3518725b
No known key found for this signature in database
GPG key ID: 3FDDD575826C5C30
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
youtube_dl/compat.py
View file

@ -2596,9 +2596,12 @@ except ImportError: # Python < 3.3
try: 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 compat_shlex_split = shlex.split
except (AssertionError, UnicodeWarning, UnicodeEncodeError): except (AssertionError, UnicodeEncodeError):
# Working around shlex issue with unicode strings on some python 2 # Working around shlex issue with unicode strings on some python 2
# versions (see http://bugs.python.org/issue1548891) # versions (see http://bugs.python.org/issue1548891)
def compat_shlex_split(s, comments=False, posix=True): def compat_shlex_split(s, comments=False, posix=True):