summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorMatthew Sherborne <msherborne@gmail.com>2013-03-11 08:17:46 +1000
committerMatthew Sherborne <msherborne@gmail.com>2013-03-11 08:17:46 +1000
commitaa1966dbd6de4744798a800f212357697c49068e (patch)
treefb82b892456cacb9df6760509547f9efe999e10d /nova
parent92482459963e21cb692c0515450abc81d69e40ed (diff)
downloadnova-aa1966dbd6de4744798a800f212357697c49068e.tar.gz
nova-aa1966dbd6de4744798a800f212357697c49068e.tar.xz
nova-aa1966dbd6de4744798a800f212357697c49068e.zip
Simple syntax fix up.
Change-Id: I3a77ed050b37432f29cc2e51822af71d08c999ad
Diffstat (limited to 'nova')
-rw-r--r--nova/compute/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py
index dc90748a4..03e9f5445 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -445,7 +445,7 @@ class API(base.Base):
try:
new_name = (CONF.multi_instance_display_name_template %
params)
- except KeyError, TypeError:
+ except (KeyError, TypeError):
LOG.exception(_('Failed to set instance name using '
'multi_instance_display_name_template.'))
new_name = instance['display_name']