dtoc: binman: Drop Python 2 code
Drop a few more Python 2 relics that are no-longer needed.
Signed-off-by: Simon Glass <sjg@chromium.org>
diff --git a/tools/binman/fmap_util.py b/tools/binman/fmap_util.py
index b03fc28..8277619 100644
--- a/tools/binman/fmap_util.py
+++ b/tools/binman/fmap_util.py
@@ -53,8 +53,8 @@
def NameToFmap(name):
- if type(name) == bytes and sys.version_info[0] >= 3:
- name = name.decode('utf-8') # pragma: no cover (for Python 2)
+ if type(name) == bytes:
+ name = name.decode('utf-8')
return name.replace('\0', '').replace('-', '_').upper()
def ConvertName(field_names, fields):
diff --git a/tools/dtoc/fdt.py b/tools/dtoc/fdt.py
index 4a78c73..965106a 100644
--- a/tools/dtoc/fdt.py
+++ b/tools/dtoc/fdt.py
@@ -460,8 +460,7 @@
prop_name: Name of property to add
val: String value of property
"""
- if sys.version_info[0] >= 3: # pragma: no cover
- val = bytes(val, 'utf-8')
+ val = bytes(val, 'utf-8')
self.AddData(prop_name, val + b'\0')
def AddSubnode(self, name):