diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-05 16:23:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-05 16:23:20 +0000 |
| commit | 04ab97e0e987712678b9ce96f54c41b161490dd5 (patch) | |
| tree | 935d012cdf40c3929f45486194b62a7f059c9865 /openstack/common/rpc | |
| parent | bd5d9f08ecc3c1fade6dce809ee9edef1c226e54 (diff) | |
| parent | 4552f1064fa50228ecdc4b5cf43c24f5401040b7 (diff) | |
| download | oslo-04ab97e0e987712678b9ce96f54c41b161490dd5.tar.gz oslo-04ab97e0e987712678b9ce96f54c41b161490dd5.tar.xz oslo-04ab97e0e987712678b9ce96f54c41b161490dd5.zip | |
Merge "Use bytes instead of str"
Diffstat (limited to 'openstack/common/rpc')
| -rw-r--r-- | openstack/common/rpc/impl_zmq.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py index 0e998e9..db88c38 100644 --- a/openstack/common/rpc/impl_zmq.py +++ b/openstack/common/rpc/impl_zmq.py @@ -89,7 +89,7 @@ def _serialize(data): Error if a developer passes us bad data. """ try: - return str(jsonutils.dumps(data, ensure_ascii=True)) + return jsonutils.dumps(data, ensure_ascii=True) except TypeError: LOG.error(_("JSON serialization failed.")) raise @@ -219,8 +219,7 @@ class ZmqClient(object): def cast(self, msg_id, topic, data, serialize=True, force_envelope=False): if serialize: data = rpc_common.serialize_msg(data, force_envelope) - self.outq.send([str(msg_id), str(topic), str('cast'), - _serialize(data)]) + self.outq.send(map(bytes, (msg_id, topic, 'cast', _serialize(data)))) def close(self): self.outq.close() @@ -445,7 +444,7 @@ class ZmqProxy(ZmqBaseReactor): msg_id = inside[-1]['args']['msg_id'] response = inside[-1]['args']['response'] LOG.debug(_("->response->%s"), response) - data = [str(msg_id), _serialize(response)] + data = map(bytes, (msg_id, _serialize(response))) else: sock_type = zmq.PUSH |