From 3d2dd79ecd2c8456ba9401f6b12333d01f61e13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Wed, 25 Mar 2020 14:36:03 +0100 Subject: SCons: Drop support for Python 2 We now require SCons 3.0+ (first version with Python 3 support), and we set min required Python 3 version to 3.5 (3.4 and earlier are EOL). --- main/main_builders.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'main') 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") -- cgit v1.2.3