Merge branch 'master' into pr/3948

This commit is contained in:
Ines Montani 2019-07-11 11:55:54 +02:00
commit 33ca0a036a
1 changed files with 3 additions and 3 deletions

View File

@ -116,7 +116,7 @@ def merge_boxes(boxes):
if merged is not None: if merged is not None:
return merged.to_bytes() return merged.to_bytes()
else: else:
return b'' return b""
def pickle_box(box): def pickle_box(box):
@ -124,10 +124,10 @@ def pickle_box(box):
def unpickle_box(byte_string): def unpickle_box(byte_string):
return Box().from_bytes(byte_string) return DocBox().from_bytes(byte_string)
copy_reg.pickle(Box, pickle_box, unpickle_box) copy_reg.pickle(DocBox, pickle_box, unpickle_box)
# Compatibility, as we had named it this previously. # Compatibility, as we had named it this previously.
Binder = DocBox Binder = DocBox