Skip to content

Ressurect unicode_errors of the Packer. #379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
methane merged 12 commits into from
Dec 3, 2019
Merged

Ressurect unicode_errors of the Packer. #379

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fd83111
Revert "Remove encoding/unicode_errors options from Packer (#378)"
methane Dec 3, 2019
97da876
Remove encoding option from the Packer
methane Dec 3, 2019
d254534
fixup
methane Dec 3, 2019
2b4ffcf
fix tests
methane Dec 3, 2019
2a4a98a
Update ChangeLog.
methane Dec 3, 2019
3b582a8
fix test
methane Dec 3, 2019
a9a769d
Use surrogateescape-d input
methane Dec 3, 2019
28d737b
fix fallback
methane Dec 3, 2019
b582067
fix fallback
methane Dec 3, 2019
1963adf
Fix PY2 test
methane Dec 3, 2019
72272db
fixup
methane Dec 3, 2019
ffcff9a
fix PY2 again
methane Dec 3, 2019
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
Prev Previous commit
Next Next commit
fix fallback
  • Loading branch information
@methane
methane committed Dec 3, 2019
commit b582067408cfd187fe4faf82c1d4cb9d6ef03416
2 changes: 1 addition & 1 deletion msgpack/fallback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ def _unpack(self, execute=EX_CONSTRUCT):
elif self._raw:
obj = bytes(obj)
else:
obj = obj.decode('utf_8')
obj = obj.decode('utf_8', self._unicode_errors)
return obj
if typ == TYPE_EXT:
return self._ext_hook(n, bytes(obj))
Expand Down
3 changes: 2 additions & 1 deletion test/test_pack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ def testPackByteArrays():
check(td)

def testIgnoreUnicodeErrors():
re = unpackb(packb(b'abc\xeddef', use_bin_type=False), raw=False, unicode_errors='ignore', use_list=1)
re = unpackb(packb(b'abc\xeddef', use_bin_type=False),
raw=False, unicode_errors='ignore')
assert re == "abcdef"

def testStrictUnicodeUnpack():
Expand Down