from oslo_serialization import jsonutils
import yardstick
-from yardstick.common.yaml_loader import yaml_load
logger = logging.getLogger(__name__)
logger.setLevel(logging.DEBUG)
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)
-def parse_yaml(file_path):
- try:
- with open(file_path) as f:
- value = yaml_load(f)
- except IOError:
- return {}
- except OSError as e:
- if e.errno != errno.EEXIST:
- raise
- else:
- return value
-
-
def makedirs(d):
try:
os.makedirs(d)
def validate_non_string_sequence(value, default=None, raise_exc=None):
- if isinstance(value, collections.Sequence) and not isinstance(value, str):
+ if isinstance(value, collections.Sequence) and not isinstance(value, six.string_types):
return value
if raise_exc:
raise raise_exc