Merge "Use oslo.serialization msgpackutils"
This commit is contained in:
commit
3dafd4e82a
|
@ -10,3 +10,4 @@ zake>=0.1.6 # Apache-2.0
|
||||||
msgpack-python>=0.4.0
|
msgpack-python>=0.4.0
|
||||||
retrying>=1.2.3,!=1.3.0 # Apache-2.0
|
retrying>=1.2.3,!=1.3.0 # Apache-2.0
|
||||||
oslo.utils>=1.4.0 # Apache-2.0
|
oslo.utils>=1.4.0 # Apache-2.0
|
||||||
|
oslo.serialization>=1.4.0 # Apache-2.0
|
||||||
|
|
|
@ -11,3 +11,4 @@ msgpack-python>=0.4.0
|
||||||
retrying>=1.2.3,!=1.3.0 # Apache-2.0
|
retrying>=1.2.3,!=1.3.0 # Apache-2.0
|
||||||
futures>=2.1.6
|
futures>=2.1.6
|
||||||
oslo.utils>=1.4.0 # Apache-2.0
|
oslo.utils>=1.4.0 # Apache-2.0
|
||||||
|
oslo.serialization>=1.4.0 # Apache-2.0
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import msgpack
|
import msgpack
|
||||||
|
from oslo_serialization import msgpackutils
|
||||||
import six
|
import six
|
||||||
|
|
||||||
from tooz import coordination
|
from tooz import coordination
|
||||||
|
@ -36,26 +37,18 @@ def to_binary(text, encoding='ascii'):
|
||||||
|
|
||||||
|
|
||||||
def dumps(data, excp_cls=coordination.ToozError):
|
def dumps(data, excp_cls=coordination.ToozError):
|
||||||
"""Serializes provided data using msgpack into a byte string.
|
"""Serializes provided data using msgpack into a byte string."""
|
||||||
|
|
||||||
TODO(harlowja): use oslo.serialization 'msgpackutils.py' when we can since
|
|
||||||
that handles more native types better than the default does...
|
|
||||||
"""
|
|
||||||
try:
|
try:
|
||||||
return msgpack.packb(data, use_bin_type=True)
|
return msgpackutils.dumps(data)
|
||||||
except (msgpack.PackException, ValueError) as e:
|
except (msgpack.PackException, ValueError) as e:
|
||||||
coordination.raise_with_cause(excp_cls, exception_message(e),
|
coordination.raise_with_cause(excp_cls, exception_message(e),
|
||||||
cause=e)
|
cause=e)
|
||||||
|
|
||||||
|
|
||||||
def loads(blob, excp_cls=coordination.ToozError):
|
def loads(blob, excp_cls=coordination.ToozError):
|
||||||
"""Deserializes provided data using msgpack (from a prior byte string).
|
"""Deserializes provided data using msgpack (from a prior byte string)."""
|
||||||
|
|
||||||
TODO(harlowja): use oslo.serialization 'msgpackutils.py' when we can since
|
|
||||||
that handles more native types better than the default does...
|
|
||||||
"""
|
|
||||||
try:
|
try:
|
||||||
return msgpack.unpackb(blob, encoding='utf-8')
|
return msgpackutils.loads(blob)
|
||||||
except (msgpack.UnpackException, ValueError) as e:
|
except (msgpack.UnpackException, ValueError) as e:
|
||||||
coordination.raise_with_cause(excp_cls, exception_message(e),
|
coordination.raise_with_cause(excp_cls, exception_message(e),
|
||||||
cause=e)
|
cause=e)
|
||||||
|
|
Loading…
Reference in New Issue