diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-26 02:04:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-26 02:04:23 +0000 |
| commit | 5229aca95f5c29b81bf423fcf438cc7223fa22ad (patch) | |
| tree | e9afeb9e3c5a8cc78479576ff9a23ab232bd25db | |
| parent | a14066d2f3bafc28bad1bfead68191ac3088227c (diff) | |
| parent | 13650b13ddd535481a0112de9c2ffcb7a2996b11 (diff) | |
| download | oslo-5229aca95f5c29b81bf423fcf438cc7223fa22ad.tar.gz oslo-5229aca95f5c29b81bf423fcf438cc7223fa22ad.tar.xz oslo-5229aca95f5c29b81bf423fcf438cc7223fa22ad.zip | |
Merge "rpc: remove some unused serialization code"
| -rw-r--r-- | openstack/common/rpc/amqp.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/openstack/common/rpc/amqp.py b/openstack/common/rpc/amqp.py index 1ab7ae4..c3e4e26 100644 --- a/openstack/common/rpc/amqp.py +++ b/openstack/common/rpc/amqp.py @@ -221,12 +221,7 @@ def msg_reply(conf, msg_id, reply_q, connection_pool, reply=None, failure = rpc_common.serialize_remote_exception(failure, log_failure) - try: - msg = {'result': reply, 'failure': failure} - except TypeError: - msg = {'result': dict((k, repr(v)) - for k, v in reply.__dict__.iteritems()), - 'failure': failure} + msg = {'result': reply, 'failure': failure} if ending: msg['ending'] = True _add_unique_id(msg) |