diff options
| author | James Ennis <james.ennis@codethink.com> | 2018-02-14 15:03:28 +0000 |
|---|---|---|
| committer | James Ennis <james.ennis@codethink.com> | 2018-03-14 14:10:26 +0000 |
| commit | a4a302bbf08415af34c804546f4e491e41dcee29 (patch) | |
| tree | f6c093755a185cc9ecea8bf302e748638d03ca5c | |
| parent | cdd17bf32dc579cf64161c301c6017f6d82e62d8 (diff) | |
| download | buildstream-a4a302bbf08415af34c804546f4e491e41dcee29.tar.gz | |
pylint - dealt with consider-merging-isinstance warnings
| -rw-r--r-- | .pylintrc | 1 | ||||
| -rw-r--r-- | buildstream/_yaml.py | 3 |
2 files changed, 1 insertions, 3 deletions
@@ -112,7 +112,6 @@ disable=##################################### # Messages that report warnings which should be addressed # ########################################################### - consider-merging-isinstance, dangerous-default-value, global-statement, len-as-condition, diff --git a/buildstream/_yaml.py b/buildstream/_yaml.py index c771e1b82..2e29f5e18 100644 --- a/buildstream/_yaml.py +++ b/buildstream/_yaml.py @@ -355,8 +355,7 @@ def node_get(node, expected_type, key, indices=[], default_value=None): raise ValueError() elif not (expected_type == list or expected_type == dict or - isinstance(value, list) or - isinstance(value, dict)): + isinstance(value, (list, dict))): value = expected_type(value) else: raise ValueError() |