colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

binman: Update 'text' entry for Python 3

Browse Source 
This code reads a binary value and then uses it as a string to look up
another value. Add conversions to make this work as expected on Python 3.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2019-05-17 22:00:49 -06:00
parent f3a58c8a78
commit e16b7b6c49
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/binman/etype/text.py
View File

@@ -7,6 +7,7 @@ from collections import OrderedDict
from entry import Entry, EntryArg from entry import Entry, EntryArg
import fdt_util import fdt_util
import tools
class Entry_text(Entry): class Entry_text(Entry):
@@ -48,9 +49,11 @@ class Entry_text(Entry):
""" """
def __init__(self, section, etype, node): def __init__(self, section, etype, node):
Entry.__init__(self, section, etype, node) Entry.__init__(self, section, etype, node)
self.text_label, = self.GetEntryArgsOrProps( label, = self.GetEntryArgsOrProps([EntryArg('text-label', str)])
[EntryArg('text-label', str)]) self.text_label = tools.ToStr(label) if type(label) != str else label
self.value, = self.GetEntryArgsOrProps([EntryArg(self.text_label, str)]) value, = self.GetEntryArgsOrProps([EntryArg(self.text_label, str)])
value = tools.ToBytes(value) if value is not None else value
self.value = value
def ObtainContents(self): def ObtainContents(self):
if not self.value: if not self.value: