patman: Drop tools.ToByte()

This is not needed in Python 3. Drop it.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-11-08 20:36:19 -07:00
parent fc0056e8d5
commit 6a4ccad8e0
3 changed files with 4 additions and 19 deletions

View File

@ -158,9 +158,9 @@ def MakeElf(elf_fname, text, data):
# Spilt the text into two parts so that we can make the entry point two
# bytes after the start of the text section
text_bytes1 = ['\t.byte\t%#x' % tools.ToByte(byte) for byte in text[:2]]
text_bytes2 = ['\t.byte\t%#x' % tools.ToByte(byte) for byte in text[2:]]
data_bytes = ['\t.byte\t%#x' % tools.ToByte(byte) for byte in data]
text_bytes1 = ['\t.byte\t%#x' % byte for byte in text[:2]]
text_bytes2 = ['\t.byte\t%#x' % byte for byte in text[2:]]
data_bytes = ['\t.byte\t%#x' % byte for byte in data]
with open(s_file, 'w') as fd:
print('''/* Auto-generated C program to produce an ELF file for testing */

View File

@ -110,7 +110,7 @@ def get_value(ftype, value):
return '%#x' % fdt_util.fdt32_to_cpu(value)
elif ftype == fdt.Type.BYTE:
ch = value[0]
return '%#x' % ord(ch) if type(ch) == str else ch
return '%#x' % (ord(ch) if type(ch) == str else ch)
elif ftype == fdt.Type.STRING:
# Handle evil ACPI backslashes by adding another backslash before them.
# So "\\_SB.GPO0" in the device tree effectively stays like that in C

View File

@ -423,21 +423,6 @@ def GetBytes(byte, size):
"""
return bytes([byte]) * size
def ToByte(ch):
"""Convert a character to an ASCII value
This is useful because in Python 2 bytes is an alias for str, but in
Python 3 they are separate types. This function converts the argument to
an ASCII value in either case.
Args:
ch: A string (Python 2) or byte (Python 3) value
Returns:
integer ASCII value for ch
"""
return ord(ch) if type(ch) == str else ch
def ToChar(byte):
"""Convert a byte to a character