openstack
/
tooz
Code Issues Proposed changes

Merge "Use oslo.serialization msgpackutils"

This commit is contained in:
Jenkins 2015-04-29 12:47:47 +00:00 committed by Gerrit Code Review
parent 9f700b61f0 1730a6d97c
commit 3dafd4e82a
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements-py3.txt
View File

@ -10,3 +10,4 @@ zake>=0.1.6 # Apache-2.0
msgpack-python>=0.4.0
retrying>=1.2.3,!=1.3.0 # Apache-2.0
oslo.utils>=1.4.0 # Apache-2.0
oslo.serialization>=1.4.0 # Apache-2.0

1
requirements.txt
View File

@ -11,3 +11,4 @@ msgpack-python>=0.4.0
retrying>=1.2.3,!=1.3.0 # Apache-2.0
futures>=2.1.6
oslo.utils>=1.4.0 # Apache-2.0
oslo.serialization>=1.4.0 # Apache-2.0

17
tooz/utils.py
View File

@ -15,6 +15,7 @@
# under the License.
import msgpack
from oslo_serialization import msgpackutils
import six
from tooz import coordination
@ -36,26 +37,18 @@ def to_binary(text, encoding='ascii'):
def dumps(data, excp_cls=coordination.ToozError):
"""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...
"""
"""Serializes provided data using msgpack into a byte string."""
try:
return msgpack.packb(data, use_bin_type=True)
return msgpackutils.dumps(data)
except (msgpack.PackException, ValueError) as e:
coordination.raise_with_cause(excp_cls, exception_message(e),
cause=e)
def loads(blob, excp_cls=coordination.ToozError):
"""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...
"""
"""Deserializes provided data using msgpack (from a prior byte string)."""
try:
return msgpack.unpackb(blob, encoding='utf-8')
return msgpackutils.loads(blob)
except (msgpack.UnpackException, ValueError) as e:
coordination.raise_with_cause(excp_cls, exception_message(e),
cause=e)