This function can be overridden so should not have an underscore. Drop it.
Signed-off-by: Simon Glass
---
tools/binman/etype/blob_phase.py | 2 +-
tools/binman/etype/cbfs.py | 4 ++--
tools/binman/etype/files.py | 2 +-
tools/binman/etype/section.py| 8
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/binman/etype/blob_phase.py b/tools/binman/etype/blob_phase.py
index 54ca54c50c1..ed25e467a13 100644
--- a/tools/binman/etype/blob_phase.py
+++ b/tools/binman/etype/blob_phase.py
@@ -48,4 +48,4 @@ class Entry_blob_phase(Entry_section):
subnode = state.AddSubnode(self._node, name)
# Read entries again, now that we have some
-self._ReadEntries()
+self.ReadEntries()
diff --git a/tools/binman/etype/cbfs.py b/tools/binman/etype/cbfs.py
index 44db7b9bb20..0a858b8b849 100644
--- a/tools/binman/etype/cbfs.py
+++ b/tools/binman/etype/cbfs.py
@@ -171,7 +171,7 @@ class Entry_cbfs(Entry):
self._cbfs_arg = fdt_util.GetString(node, 'cbfs-arch', 'x86')
self.align_default = None
self._cbfs_entries = OrderedDict()
-self._ReadSubnodes()
+self.ReadEntries()
self.reader = None
def ObtainContents(self, skip=None):
@@ -204,7 +204,7 @@ class Entry_cbfs(Entry):
self.SetContents(data)
return True
-def _ReadSubnodes(self):
+def ReadEntries(self):
"""Read the subnodes to find out what should go in this CBFS"""
for node in self._node.subnodes:
entry = Entry.Create(self, node)
diff --git a/tools/binman/etype/files.py b/tools/binman/etype/files.py
index 9b04a496a85..927d0f071df 100644
--- a/tools/binman/etype/files.py
+++ b/tools/binman/etype/files.py
@@ -64,4 +64,4 @@ class Entry_files(Entry_section):
state.AddInt(subnode, 'align', self._files_align)
# Read entries again, now that we have some
-self._ReadEntries()
+self.ReadEntries()
diff --git a/tools/binman/etype/section.py b/tools/binman/etype/section.py
index e2949fc9163..281a228cd0e 100644
--- a/tools/binman/etype/section.py
+++ b/tools/binman/etype/section.py
@@ -85,9 +85,9 @@ class Entry_section(Entry):
if filename:
self._filename = filename
-self._ReadEntries()
+self.ReadEntries()
-def _ReadEntries(self):
+def ReadEntries(self):
for node in self._node.subnodes:
if node.name.startswith('hash') or
node.name.startswith('signature'):
continue
@@ -741,5 +741,5 @@ class Entry_section(Entry):
missing: List of missing properties / entry args, each a string
"""
if not self._ignore_missing:
-entry.Raise('Missing required properties/entry args: %s' %
- (', '.join(missing)))
+missing = ', '.join(missing)
+entry.Raise(f'Missing required properties/entry args: {missing}')
--
2.34.0.rc2.393.gf8c9666880-goog
