From aa1966dbd6de4744798a800f212357697c49068e Mon Sep 17 00:00:00 2001
From: Matthew Sherborne <msherborne@gmail.com>
Date: Mon, 11 Mar 2013 08:17:46 +1000
Subject: Simple syntax fix up.

Change-Id: I3a77ed050b37432f29cc2e51822af71d08c999ad
---
 nova/compute/api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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']
-- 
cgit