From 57e82559f82e05d2cedf45e103d3dfce78592a64 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Thu, 29 Jun 2017 17:58:38 +0200 Subject: Use the recommended exception syntax Today I learnt that the use of except Exception, variable is not recommended anymore and it is not supported after python3. When using >=2.6, the syntax should be except Exception as variable. https://www.python.org/dev/peps/pep-3110/ Change-Id: I213c220fc6e92878ffa4737efa16adb76ace1271 Signed-off-by: Manuel Buil --- sfc/lib/utils.py | 2 +- sfc/tests/functest/sfc_one_chain_two_service_functions.py | 2 +- sfc/tests/functest/sfc_symmetric_chain.py | 2 +- sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'sfc') diff --git a/sfc/lib/utils.py b/sfc/lib/utils.py index 36124d92..2a188960 100644 --- a/sfc/lib/utils.py +++ b/sfc/lib/utils.py @@ -526,7 +526,7 @@ def wait_for_classification_rules(ovs_logger, compute_nodes, odl_ip, odl_port, if timeout <= 0: logger.error("Timeout but classification rules are not updated") - except Exception, e: + except Exception as e: logger.error('Error when waiting for classification rules: %s' % e) diff --git a/sfc/tests/functest/sfc_one_chain_two_service_functions.py b/sfc/tests/functest/sfc_one_chain_two_service_functions.py index 875eff9a..3f1165ec 100644 --- a/sfc/tests/functest/sfc_one_chain_two_service_functions.py +++ b/sfc/tests/functest/sfc_one_chain_two_service_functions.py @@ -187,7 +187,7 @@ def main(): testTopology,)) try: t1.start() - except Exception, e: + except Exception as e: logger.error("Unable to start the thread that counts time %s" % e) logger.info("Assigning floating IPs to instances") diff --git a/sfc/tests/functest/sfc_symmetric_chain.py b/sfc/tests/functest/sfc_symmetric_chain.py index e3fd26f3..686d7fc0 100644 --- a/sfc/tests/functest/sfc_symmetric_chain.py +++ b/sfc/tests/functest/sfc_symmetric_chain.py @@ -189,7 +189,7 @@ def main(): try: t1.start() - except Exception, e: + except Exception as e: logger.error("Unable to start the thread that counts time %s" % e) logger.info("Assigning floating IPs to instances") diff --git a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py index 07bf5166..7f121b93 100644 --- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py +++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py @@ -199,7 +199,7 @@ def main(): try: t1.start() - except Exception, e: + except Exception as e: logger.error("Unable to start the thread that counts time %s" % e) logger.info("Assigning floating IPs to instances") @@ -291,7 +291,7 @@ def main(): testTopology,)) try: t2.start() - except Exception, e: + except Exception as e: logger.error("Unable to start the thread that counts time %s" % e) logger.info("Wait for ODL to update the classification rules in OVS") -- cgit 1.2.3-korg