upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-13 10:50:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

msgpack: simplify, we are always using msgpack >= 1.0.3 now

Browse source 
see requirements, we also check this in is_supported_msgpack().

update comment about msgpack api change.
This commit is contained in:
Thomas Waldmann 2024-01-04 19:13:28 +01:00
parent 0f23bda622
commit 8cb7bc3d32
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/borg/helpers/msgpack.py
View file

@ -3,8 +3,9 @@ from ..constants import * # NOQA
# wrapping msgpack ---------------------------------------------------------------------------------------------------
#
# due to the planned breaking api changes in upstream msgpack, we wrap it the way we need it -
# due to the breaking api changes in upstream msgpack (from 0.x to 1.0), we wrapped it the way we need it -
# to avoid having lots of clutter in the calling code. see tickets #968 and #3632.
# as borg 1.4 now requires msgpack > 1.0 anyway, the wrapper has reduced functionality, but was kept.
#
# Packing
# -------
@ -30,8 +31,6 @@ from msgpack import OutOfData
version = mp_version
_post_100 = version >= (1, 0, 0)
class PackException(Exception):
"""Exception while msgpack packing"""
@ -95,13 +94,12 @@ class Unpacker(mp_Unpacker):
object_hook=object_hook, object_pairs_hook=object_pairs_hook, list_hook=list_hook,
unicode_errors=unicode_errors, max_buffer_size=max_buffer_size,
ext_hook=ext_hook,
strict_map_key=strict_map_key,
max_str_len=max_str_len,
max_bin_len=max_bin_len,
max_array_len=max_array_len,
max_map_len=max_map_len,
max_ext_len=max_ext_len)
if _post_100:
kw['strict_map_key'] = strict_map_key
super().__init__(**kw)
def unpack(self):
@ -133,15 +131,13 @@ def unpackb(packed, *, raw=True, unicode_errors=None,
**kwargs):
assert unicode_errors is None
try:
kw = dict(raw=raw, unicode_errors=unicode_errors,
kw = dict(raw=raw, unicode_errors=unicode_errors, strict_map_key=strict_map_key,
max_str_len=max_str_len,
max_bin_len=max_bin_len,
max_array_len=max_array_len,
max_map_len=max_map_len,
max_ext_len=max_ext_len)
kw.update(kwargs)
if _post_100:
kw['strict_map_key'] = strict_map_key
return mp_unpackb(packed, **kw)
except Exception as e:
raise UnpackException(e)
@ -157,15 +153,13 @@ def unpack(stream, *, raw=True, unicode_errors=None,
**kwargs):
assert unicode_errors is None
try:
kw = dict(raw=raw, unicode_errors=unicode_errors,
kw = dict(raw=raw, unicode_errors=unicode_errors, strict_map_key=strict_map_key,
max_str_len=max_str_len,
max_bin_len=max_bin_len,
max_array_len=max_array_len,
max_map_len=max_map_len,
max_ext_len=max_ext_len)
kw.update(kwargs)
if _post_100:
kw['strict_map_key'] = strict_map_key
return mp_unpack(stream, **kw)
except Exception as e:
raise UnpackException(e)