openstack/ironic
Code Issues Proposed changes

Merge "Follow up nits of Exception to str type conversion"

Browse Source
This commit is contained in:
Jenkins
2015-12-16 02:28:37 +00:00
committed by Gerrit Code Review
parent cc22b19168 de10be57f6
commit 1b9cf178a7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ironic/common/config_generator/generator.py
View File

@@ -150,7 +150,7 @@ def _import_module(mod_str):
else: else:
return importutils.import_module(mod_str) return importutils.import_module(mod_str)
except Exception as e: except Exception as e:
sys.stderr.write("Error importing module %s: %s\n" % (mod_str, str(e))) sys.stderr.write("Error importing module %s: %s\n" % (mod_str, e))
return None return None
@@ -271,7 +271,7 @@ def _print_opt(opt, group):
try: try:
opt_type = OPTION_REGEX.search(str(type(opt))).group(0) opt_type = OPTION_REGEX.search(str(type(opt))).group(0)
except (ValueError, AttributeError) as err: except (ValueError, AttributeError) as err:
sys.stderr.write("%s\n" % str(err)) sys.stderr.write("%s\n" % err)
sys.exit(1) sys.exit(1)
opt_help = u'%s (%s)' % (opt_help, opt_help = u'%s (%s)' % (opt_help,
OPT_TYPES[opt_type]) OPT_TYPES[opt_type])
@@ -292,13 +292,13 @@ def _print_opt(opt, group):
_print_type(opt_type, opt_name, opt_default) _print_type(opt_type, opt_name, opt_default)
print('') print('')
except Exception as e: except Exception as e:
sys.stderr.write('Error in option "%s": %s\n' % (opt_name, str(e))) sys.stderr.write('Error in option "%s": %s\n' % (opt_name, e))
sys.exit(1) sys.exit(1)
def _print_type(opt_type, opt_name, opt_default): def _print_type(opt_type, opt_name, opt_default):
if opt_type == OPT: if opt_type == OPT:
print('#%s=%s' % (opt_name, str(opt_default))) print('#%s=%s' % (opt_name, opt_default))
elif opt_type == STROPT: elif opt_type == STROPT:
assert(isinstance(opt_default, six.string_types)) assert(isinstance(opt_default, six.string_types))
print('#%s=%s' % (opt_name, _sanitize_default(opt_name, print('#%s=%s' % (opt_name, _sanitize_default(opt_name,