From c8845bb2e538d1d768f35dca386441f6e8d64344 Mon Sep 17 00:00:00 2001 From: Chris Neale Date: Tue, 23 Jul 2019 11:06:37 +0100 Subject: [PATCH] Make print() calls consistent, and python3-compatible --- build.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.py b/build.py index 4235c8d7..28319853 100644 --- a/build.py +++ b/build.py @@ -29,7 +29,7 @@ haldir = os.path.join (srcdir, "hal") halconfig = config.get("board", "halfile") halconfigfile = os.path.join (haldir, halconfig) if os.path.isfile(halconfigfile) and os.access(halconfigfile, os.R_OK): - print "Parsing hardware configuration from " + halconfigfile + print("Parsing hardware configuration from " + halconfigfile) else: sys.exit("Missing file " + halconfigfile + ", please create it! Aborting.") @@ -37,21 +37,21 @@ else: lmicconfig = config.get("common", "lmicconfigfile") lmicconfigfile = os.path.join (srcdir, lmicconfig) if os.path.isfile(lmicconfigfile) and os.access(lmicconfigfile, os.R_OK): - print "Parsing LMIC configuration from " + lmicconfigfile + print("Parsing LMIC configuration from " + lmicconfigfile) else: sys.exit("Missing file " + lmicconfigfile + ", please create it! Aborting.") # check if lora key file is present in source directory lorakeyfile = os.path.join (srcdir, config.get("common", "lorakeyfile")) if os.path.isfile(lorakeyfile) and os.access(lorakeyfile, os.R_OK): - print "Parsing LORAWAN keys from " + lorakeyfile + print("Parsing LORAWAN keys from " + lorakeyfile) else: sys.exit("Missing file " + lorakeyfile + ", please create it! Aborting.") # check if ota key file is present in source directory otakeyfile = os.path.join (srcdir, config.get("common", "otakeyfile")) if os.path.isfile(otakeyfile) and os.access(otakeyfile, os.R_OK): - print "Parsing OTA keys from " + otakeyfile + print("Parsing OTA keys from " + otakeyfile) else: sys.exit("Missing file " + otakeyfile + ", please create it! Aborting.") @@ -66,7 +66,7 @@ myboard = mykeys["board"] myuploadspeed = mykeys["upload_speed"] env.Replace(BOARD=myboard) env.Replace(UPLOAD_SPEED=myuploadspeed) -print '\033[94m' + "TARGET BOARD: " + myboard + " @ " + myuploadspeed + "bps" + '\033[0m' +print('\033[94m' + "TARGET BOARD: " + myboard + " @ " + myuploadspeed + "bps" + '\033[0m') # parse ota key file with open(otakeyfile) as myfile: @@ -136,4 +136,4 @@ def publish_bintray(source, target, env): # put build file name and upload command to platformio environment env.Replace( PROGNAME="firmware_" + package + "_v%s" % version, - UPLOADCMD=publish_bintray) \ No newline at end of file + UPLOADCMD=publish_bintray)