From e9b26ebb00bca06223e10c236bce2555c97dd97f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 15 Mar 2019 15:48:32 +0530 Subject: [PATCH] Dont rely on constants from the pickle module --- src/calibre/utils/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/utils/__init__.py b/src/calibre/utils/__init__.py index 070191dd1d..c747ee4daf 100644 --- a/src/calibre/utils/__init__.py +++ b/src/calibre/utils/__init__.py @@ -28,7 +28,7 @@ def join_with_timeout(q, timeout=2): def unpickle_binary_string(data): # Maintains compatibility with python's pickle module protocol version 2 import struct - from pickle import PROTO, SHORT_BINSTRING, BINSTRING + PROTO, SHORT_BINSTRING, BINSTRING = b'\x80', b'U', b'T' if data.startswith(PROTO + b'\x02'): offset = 2 which = data[offset] @@ -47,6 +47,6 @@ def unpickle_binary_string(data): def pickle_binary_string(data): # Maintains compatibility with python's pickle module protocol version 2 import struct - from pickle import PROTO, BINSTRING, STOP + PROTO, STOP, BINSTRING = b'\x80', b'.', b'T' data = bytes(data) return PROTO + b'\x02' + BINSTRING + struct.pack(b'