remove unnecessary uses of eval
There are easier ways to do everything that was being done with eval.
diff --git a/oft b/oft
index 5d8b20e..c891555 100755
--- a/oft
+++ b/oft
@@ -199,7 +199,7 @@
"Convert options class to OFT configuration dictionary"
cfg = config_default.copy()
for key in cfg.keys():
- cfg[key] = eval("opts." + key)
+ cfg[key] = getattr(opts, key)
# Special case checks
if opts.debug not in DEBUG_LEVELS.keys():
@@ -224,8 +224,7 @@
#@todo parse port map as option?
# Set up default values
- for key in cfg_dflt.keys():
- eval("parser.set_defaults("+key+"=cfg_dflt['"+key+"'])")
+ parser.set_defaults(**cfg_dflt)
#@todo Add options via dictionary
plat_help = """Set the platform type. Valid values include:
@@ -378,7 +377,7 @@
def add_test(suite, mod, name):
logging.info("Adding test " + mod.__name__ + "." + name)
- suite.addTest(eval("mod." + name)())
+ suite.addTest(getattr(mod, name)())
def _space_to(n, str):
"""
@@ -443,7 +442,7 @@
print start_str + _space_to(22, start_str) + desc
for test in config["all_tests"][mod]:
try:
- desc = eval('mod.' + test + '.__doc__.strip()')
+ desc = getattr(mod, test).__doc__.strip()
desc = desc.split('\n')[0]
except:
desc = "No description"
diff --git a/src/python/oftest/parse.py b/src/python/oftest/parse.py
index 11d6983..8826c0c 100644
--- a/src/python/oftest/parse.py
+++ b/src/python/oftest/parse.py
@@ -201,7 +201,7 @@
@param mac_str The string to convert
@return Array of 6 integer values
"""
- return map(lambda val:eval("0x" + val), mac_str.split(":"))
+ return map(lambda val: int(val, 16), mac_str.split(":"))
def parse_ip(ip_str):
"""
@@ -212,7 +212,7 @@
@param ip_str The string to convert
@return Integer value
"""
- array = map(lambda val:eval(val),ip_str.split("."))
+ array = map(lambda val: int(val), ip_str.split("."))
val = 0
for a in array:
val <<= 8