Skip to content

Commit

Permalink
[compat] Fix compat_shlex_split for non-ASCII input
Browse files Browse the repository at this point in the history
  • Loading branch information
Yen Chi Hsuan committed Jul 7, 2016
1 parent 01a0c51 commit dfe5fa4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions test/test_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ def test_compat_urllib_parse_urlencode(self):
def test_compat_shlex_split(self):
self.assertEqual(compat_shlex_split('-option "one two"'), ['-option', 'one two'])
self.assertEqual(compat_shlex_split('-option "one\ntwo" \n -flag'), ['-option', 'one\ntwo', '-flag'])
self.assertEqual(compat_shlex_split('-val 中文'), ['-val', '中文'])

def test_compat_etree_fromstring(self):
xml = '''
Expand Down
8 changes: 5 additions & 3 deletions youtube_dl/compat.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# coding: utf-8
from __future__ import unicode_literals

import binascii
Expand Down Expand Up @@ -2594,15 +2595,16 @@ def compat_shlex_quote(s):
return "'" + s.replace("'", "'\"'\"'") + "'"


if sys.version_info >= (2, 7, 3):
try:
assert shlex.split('中文') == ['中文']
compat_shlex_split = shlex.split
else:
except (AssertionError, UnicodeWarning, 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):
if isinstance(s, compat_str):
s = s.encode('utf-8')
return shlex.split(s, comments, posix)
return list(map(lambda s: s.decode('utf-8'), shlex.split(s, comments, posix)))


def compat_ord(c):
Expand Down

0 comments on commit dfe5fa4

Please sign in to comment.