diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-04-13 11:07:24 +0000 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-04-13 11:07:24 +0000 |
| commit | 485fb56eb86a1fcd35fd3d0d37efb5ec514dba2b (patch) | |
| tree | f6b23e9670e70af104a248010798942acdbc5c7b /Lib/pickle.py | |
| parent | 36067606707844f7de076cf1846afb767b494d7e (diff) | |
| download | cpython-git-485fb56eb86a1fcd35fd3d0d37efb5ec514dba2b.tar.gz | |
Issue #8383: pickle and pickletools use surrogatepass error handler when
encoding unicode as utf8 to support lone surrogates and stay compatible with
Python 2.x and 3.0
Diffstat (limited to 'Lib/pickle.py')
| -rw-r--r-- | Lib/pickle.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/pickle.py b/Lib/pickle.py index 8a2abcc138..c4fc2c4d1f 100644 --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -499,7 +499,7 @@ class _Pickler: def save_str(self, obj, pack=struct.pack): if self.bin: - encoded = obj.encode('utf-8') + encoded = obj.encode('utf-8', 'surrogatepass') n = len(encoded) self.write(BINUNICODE + pack("<i", n) + encoded) else: @@ -966,7 +966,7 @@ class _Unpickler: def load_binunicode(self): len = mloads(b'i' + self.read(4)) - self.append(str(self.read(len), 'utf-8')) + self.append(str(self.read(len), 'utf-8', 'surrogatepass')) dispatch[BINUNICODE[0]] = load_binunicode def load_short_binstring(self): |