Commit a4a302bb authored by James Ennis's avatar James Ennis
Browse files

pylint - dealt with consider-merging-isinstance warnings

parent cdd17bf3

.pylintrc

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ disable=##################################### 
        # Messages that report warnings which should be addressed #

        ###########################################################



        consider-merging-isinstance,

        dangerous-default-value,

        global-statement,

        len-as-condition,

buildstream/_yaml.py

+1 −2
Original line number Diff line number Diff line
@@ -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()