summaryrefslogtreecommitdiffstats
path: root/openstack/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-04-02 23:54:29 +0000
committerGerrit Code Review <review@openstack.org>2013-04-02 23:54:29 +0000
commitfc777f1f79418c7400acd3b2b6628f1d7d5f073d (patch)
treeb5e5bd2907eb356437b511df6d34fd3a964c608c /openstack/common
parent47e9e98d6fdecb9d08cb3020a78d427eb8c76773 (diff)
parent0912900042f777f2c31776aaedd8325e60287f33 (diff)
downloadoslo-fc777f1f79418c7400acd3b2b6628f1d7d5f073d.tar.gz
oslo-fc777f1f79418c7400acd3b2b6628f1d7d5f073d.tar.xz
oslo-fc777f1f79418c7400acd3b2b6628f1d7d5f073d.zip
Merge "rpc: fix positional args in remote exceptions"
Diffstat (limited to 'openstack/common')
-rw-r--r--openstack/common/rpc/common.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstack/common/rpc/common.py b/openstack/common/rpc/common.py
index 42aaf09..6fb39e1 100644
--- a/openstack/common/rpc/common.py
+++ b/openstack/common/rpc/common.py
@@ -339,7 +339,7 @@ def deserialize_remote_exception(conf, data):
if not issubclass(klass, Exception):
raise TypeError("Can only deserialize Exceptions")
- failure = klass(**failure.get('kwargs', {}))
+ failure = klass(*failure.get('args', []), **failure.get('kwargs', {}))
except (AttributeError, TypeError, ImportError):
return RemoteError(name, failure.get('message'), trace)