Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mog_commons/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.1.4'
__version__ = '0.1.5'
11 changes: 6 additions & 5 deletions src/mog_commons/string.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,11 @@ def unicode_decode(data, encoding_list):
assert encoding_list, 'encodings must not be empty.'

xs = distinct(encoding_list if isinstance(encoding_list, list) else [encoding_list])
init, last = xs[:-1], xs[-1]
for encoding in init:
first_exp = None
for i, encoding in enumerate(xs):
try:
return data.decode(encoding)
except UnicodeDecodeError:
pass
return data.decode(last)
except UnicodeDecodeError as e:
if i == 0:
first_exp = e
raise first_exp
5 changes: 4 additions & 1 deletion tests/mog_commons/test_string.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,8 @@ def test_unicode_decode(self):
self.assertEqual(string.unicode_decode('あいうえお'.encode('utf-8'), ['utf-8', 'utf-8', 'utf-8']), 'あいうえお')
self.assertEqual(string.unicode_decode('あいうえお'.encode('sjis'), ['ascii', 'utf-8', 'sjis']), 'あいうえお')
self.assertRaisesRegexp(
UnicodeDecodeError, "'shift_jis' codec can't decode",
UnicodeDecodeError, "'ascii' codec can't decode",
string.unicode_decode, 'あいうえお'.encode('utf-8'), ['ascii', 'sjis'])
self.assertRaisesRegexp(
UnicodeDecodeError, "'shift_jis' codec can't decode",
string.unicode_decode, 'あいうえお'.encode('utf-8'), ['sjis', 'ascii'])