ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplify conditions with get and getattr optional arguments

pull/10065/head
Jimmy Brisson 2019-03-12 11:17:20 -05:00
parent 28c909c92f
commit 59d35e36d2
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/targets/__init__.py
View File

@ -385,8 +385,7 @@ class Target(namedtuple("Target", "name json_data resolution_order resolution_or
# "class_name" must refer to a class in this file, so check if the
# class exists
mdata = self.get_module_data()
if class_name not in mdata or \
not inspect.isclass(mdata[class_name]):
if not inspect.isclass(mdata.get(class_name, None)):
raise HookError(
("Class '%s' required by '%s' in target '%s'"
% (class_name, hook_data["function"], self.name)) +
@ -394,8 +393,7 @@ class Target(namedtuple("Target", "name json_data resolution_order resolution_or
# "function_name" must refer to a static function inside class
# "class_name"
cls = mdata[class_name]
if (not hasattr(cls, function_name)) or \
(not inspect.isfunction(getattr(cls, function_name))):
if not inspect.isfunction(getattr(cls, function_name, None)):
raise HookError(
("Static function '%s' " % function_name) +
("required by '%s' " % hook_data["function"]) +