michaelh/zephyr
1
0
Fork 0
Code Releases Activity

scripts: edtlib: Make _binding_include() global to fix pylint warning

Browse source 
Doesn't use 'self'. Fixes this pylint warning:

    scripts/dts/edtlib.py:272:4: R0201: Method could be a function
    (no-self-use)

Fixing pylint warnings for a CI check.

Signed-off-by: Ulf Magnusson <Ulf.Magnusson@nordicsemi.no>
This commit is contained in:
Ulf Magnusson 2019-09-05 22:31:09 +02:00 • committed by Kumar Gala
commit 8f22529e74
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
scripts/dts/edtlib.py
View file

@ -160,7 +160,7 @@ class EDT:
# Add legacy '!include foo.yaml' handling. Do # Add legacy '!include foo.yaml' handling. Do
# yaml.Loader.add_constructor() instead of yaml.add_constructor() to be # yaml.Loader.add_constructor() instead of yaml.add_constructor() to be
# compatible with both version 3.13 and version 5.1 of PyYAML. # compatible with both version 3.13 and version 5.1 of PyYAML.
yaml.Loader.add_constructor("!include", self._binding_include) yaml.Loader.add_constructor("!include", _binding_include)
dt_compats = _dt_compats(self._dt) dt_compats = _dt_compats(self._dt)
# Searches for any 'compatible' string mentioned in the devicetree # Searches for any 'compatible' string mentioned in the devicetree
@ -269,20 +269,6 @@ class EDT:
with open(paths[0], encoding="utf-8") as f: with open(paths[0], encoding="utf-8") as f:
return yaml.load(f, Loader=yaml.Loader) return yaml.load(f, Loader=yaml.Loader)
def _binding_include(self, loader, node):
# Implements !include, for backwards compatibility.
# '!include [foo, bar]' just becomes [foo, bar].
if isinstance(node, yaml.ScalarNode):
# !include foo.yaml
return [loader.construct_scalar(node)]
if isinstance(node, yaml.SequenceNode):
# !include [foo.yaml, bar.yaml]
return loader.construct_sequence(node)
_binding_inc_error("unrecognised node type in !include statement")
def _init_devices(self): def _init_devices(self):
# Creates a list of devices (Device objects) from the DT nodes, in # Creates a list of devices (Device objects) from the DT nodes, in
# self.devices # self.devices
@ -1258,6 +1244,21 @@ def _bad_overwrite(to_dict, from_dict, prop):
return True return True
def _binding_include(loader, node):
# Implements !include, for backwards compatibility. '!include [foo, bar]'
# just becomes [foo, bar].
if isinstance(node, yaml.ScalarNode):
# !include foo.yaml
return [loader.construct_scalar(node)]
if isinstance(node, yaml.SequenceNode):
# !include [foo.yaml, bar.yaml]
return loader.construct_sequence(node)
_binding_inc_error("unrecognised node type in !include statement")
def _check_binding(binding, binding_path): def _check_binding(binding, binding_path):
# Does sanity checking on 'binding' # Does sanity checking on 'binding'