From: Ross Brattain <ross.b.brattain@intel.com>
Date: Tue, 29 Aug 2017 06:44:36 +0000 (+0000)
Subject: Merge "utils: catch SyntaxError during import"
X-Git-Tag: opnfv-5.0.RC1~217
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=96b4d985bb8d83751e65a3ad5fa710e9eeddcb9b;hp=b583d4bfe6bc49e0f3bf4beec6612390a1d4bd24;p=yardstick.git

Merge "utils: catch SyntaxError during import"
---

diff --git a/yardstick/common/utils.py b/yardstick/common/utils.py
index 1d7ea071c..68c9ed63f 100644
--- a/yardstick/common/utils.py
+++ b/yardstick/common/utils.py
@@ -90,7 +90,7 @@ def import_modules_from_package(package):
         for module_name in missing_modules:
             try:
                 sys.modules[module_name] = importutils.import_module(module_name)
-            except ImportError:
+            except (ImportError, SyntaxError):
                 logger.exception("unable to import %s", module_name)