Use Python 3.x compatible except construct

Python 3.x deprecated excecpt x,y. Use except x as y,
which works with any Python version >= 2.6

Change-Id: I264049ee41e75bcedea86adf7c2011c343f47ddb

diff --git a/bin/heat-api b/bin/heat-api
index 0fa6f7c785d46bf2d19369088116356be8c03e4d..9dc6943e0469a1877ed5407e7147c69fe15a4c58 100755 (executable)
--- a/bin/heat-api
+++ b/bin/heat-api
@@ -61,5 +61,5 @@ if __name__ == '__main__':
         server = wsgi.Server()
         server.start(app, cfg.CONF, default_port=port)
         server.wait()
-    except RuntimeError, e:
+    except RuntimeError as e:
         sys.exit("ERROR: %s" % e)

diff --git a/bin/heat-api-cfn b/bin/heat-api-cfn
index 48e9f9d83c82dcd190c48959af6271f41b973bd0..db414d19b17a4dda7fe55767be662680a53a3d20 100755 (executable)
--- a/bin/heat-api-cfn
+++ b/bin/heat-api-cfn
@@ -63,5 +63,5 @@ if __name__ == '__main__':
         server = wsgi.Server()
         server.start(app, cfg.CONF, default_port=port)
         server.wait()
-    except RuntimeError, e:
+    except RuntimeError as e:
         sys.exit("ERROR: %s" % e)

diff --git a/bin/heat-cfn b/bin/heat-cfn
index 57e579e8507bbbf8eaf9e0d66699c802dae40584..b26461aa0876b07dad7cf65d985b3eb2e83756e5 100755 (executable)
--- a/bin/heat-cfn
+++ b/bin/heat-cfn
@@ -682,7 +682,7 @@ Commands:
         sys.exit(result)
     except (RuntimeError,
             NotImplementedError,
-            exception.ClientConfigurationError), ex:
+            exception.ClientConfigurationError) as ex:
         oparser.print_usage()
         logging.error("ERROR: %s" % ex)
         sys.exit(1)

diff --git a/bin/heat-watch b/bin/heat-watch
index 152b98f9f9b4ab164eaf78acb0624585e4d0fc26..12e4264aa597bad750a17617b04b5941c7fc77d3 100755 (executable)
--- a/bin/heat-watch
+++ b/bin/heat-watch
@@ -270,7 +270,7 @@ Commands:
         sys.exit(result)
     except (RuntimeError,
             NotImplementedError,
-            exception.ClientConfigurationError), ex:
+            exception.ClientConfigurationError) as ex:
         oparser.print_usage()
         logging.error("ERROR: %s" % ex)
         sys.exit(1)