diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-26 09:28:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-26 09:28:11 +0100 |
| commit | 24fa0d871d51a7927027b7a1cc013d8681a53929 (patch) | |
| tree | e2fbb7d2f84aad8c919f0997d7e063660be6e3ea /main/main_builders.py | |
| parent | fafff6b37922b27d1f573f36220a6b9d91a8ea33 (diff) | |
| parent | 3d2dd79ecd2c8456ba9401f6b12333d01f61e13e (diff) | |
Merge pull request #37294 from akien-mga/scons-drop-python2
SCons: Drop support for Python 2
Diffstat (limited to 'main/main_builders.py')
| -rw-r--r-- | main/main_builders.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/main/main_builders.py b/main/main_builders.py index c48aaaa572..e24070ccc3 100644 --- a/main/main_builders.py +++ b/main/main_builders.py @@ -4,7 +4,6 @@ All such functions are invoked in a subprocess on Windows to prevent build flaki """ from platform_methods import subprocess_main -from compat import byte_to_str from collections import OrderedDict @@ -22,7 +21,7 @@ def make_splash(target, source, env): g.write('static const Color boot_splash_bg_color = Color(0.14, 0.14, 0.14);\n') g.write("static const unsigned char boot_splash_png[] = {\n") for i in range(len(buf)): - g.write(byte_to_str(buf[i]) + ",\n") + g.write(str(buf[i]) + ",\n") g.write("};\n") g.write("#endif") @@ -41,7 +40,7 @@ def make_splash_editor(target, source, env): g.write('static const Color boot_splash_editor_bg_color = Color(0.14, 0.14, 0.14);\n') g.write("static const unsigned char boot_splash_editor_png[] = {\n") for i in range(len(buf)): - g.write(byte_to_str(buf[i]) + ",\n") + g.write(str(buf[i]) + ",\n") g.write("};\n") g.write("#endif") @@ -59,7 +58,7 @@ def make_app_icon(target, source, env): g.write("#define APP_ICON_H\n") g.write("static const unsigned char app_icon_png[] = {\n") for i in range(len(buf)): - g.write(byte_to_str(buf[i]) + ",\n") + g.write(str(buf[i]) + ",\n") g.write("};\n") g.write("#endif") |