Use with open(...) as ...: context managers

Instead of manually opening and closes file objects, use the context
manager that will properly handle opening and closing files for us, even
in the event of some error

radio/util/addtr.py

@@ -8,12 +8,14 @@ import glob
 
 def addLine(filename, newline, after):
     print(filename, newline)
-    lines = file(filename, 'r').readlines()
+    with open(filename, 'r') as f:
+        lines = f.readlines()
     for i, line in enumerate(lines):
         if after in line:
             lines.insert(i + 1, newline + '\n')
             break
-    file(filename, 'w').writelines(lines)
+    with open(filename, 'w') as f:
+        f.writelines(lines)
 
 
 def modifyTranslations(constant, translation, after):

radio/util/bin2lbm.py

@@ -1,22 +1,20 @@
 #!/usr/bin/env python
 
+from __future__ import division
 import sys
 
 filename = sys.argv[1]
 fileout = sys.argv[2]
 
-fr = open(filename, "rb")
+# Read entire file
-fw = open(fileout, "w")
+with open(filename, "rb") as fr:
+    sts = fr.read()
+# Parse into chunks of 16 bytes
+sts = [sts[i * 16:(i + 1) * 16] for i in range(len(sts) // 16)]
 
-st = fr.read(16)
+with open(fileout, "w") as fw:
-
+    for st in sts:
-while st:
         for b in st:
             fw.write("0x%02x," % ord(b))
         fw.write("\n")
-    st = fr.read(16)
+    fw.write("\n")
-
-fw.write("\n")
-
-fw.close()
-fr.close()

radio/util/copyright.py

@@ -13,9 +13,8 @@ def writeheader(filename, header):
     header should be a list of strings
     skip should be a regex
     """
-    f = open(filename,"r")
+    with open(filename, "r") as f:
-    inpt =f.readlines()
+        inpt = f.readlines()
-    f.close()
     output = []
 
     # comment out the next 3 lines if you don't wish to preserve shebangs
@@ -36,18 +35,16 @@ def writeheader(filename, header):
     for line in inpt:
         output.append(line)
     try:
-        f = open(filename,'w')
+        with open(filename, 'w') as f:
             f.writelines(output)
-        f.close()
         print("added header to %s" % filename)
     except IOError as err:
         print("something went wrong trying to add header to %s: %s" % (filename, err))
 
 
 def main(args=sys.argv):
-    headerfile = open(args[1])
+    with open(args[1]) as headerfile:
         header = headerfile.readlines()
-    headerfile.close()
     writeheader(args[2], header)
 
 

radio/util/font2png.py

@@ -88,7 +88,7 @@ def createFontBitmap(filename, fontname, fontsize, fontbold, foreground, backgro
     painter.end()
     image.save(filename + ".png")
     if coordsfile:
-        f = file(filename + ".specs", "w")
+        with open(filename + ".specs", "w") as f:
             f.write("{ ")
             f.write(",".join(str(tmp) for tmp in coords))
             if extraWidth:
@@ -96,7 +96,6 @@ def createFontBitmap(filename, fontname, fontsize, fontbold, foreground, backgro
                     f.write(", %d" % (int(coords[-1]) + i * (extraWidth / 12)))
                 # f.write(file("fonts/extra_%dpx.specs" % fontsize).read())
             f.write(" }")
-        f.close()
     return coords
 
 if __name__ == "__main__":

radio/util/img2lbm.py

@@ -16,19 +16,18 @@ def writeSize(f, width, height):
         f.write("%d,%d,\n" % (width, height))
 
 
-f = open(sys.argv[2], "w")
+with open(sys.argv[2], "w") as f:
+    lcdwidth = int(sys.argv[3])
 
-lcdwidth = int(sys.argv[3])
+    if len(sys.argv) > 4:
-
-if len(sys.argv) > 4:
         what = sys.argv[4]
-else:
+    else:
         for s in ("03x05", "04x06", "05x07", "08x10", "10x14", "22x38"):
             if s in sys.argv[2]:
                 what = s
                 break
 
-if what == "1bit":
+    if what == "1bit":
         rows = 1
         if len(sys.argv) > 5:
             rows = int(sys.argv[5])
@@ -41,7 +40,7 @@ if what == "1bit":
                         value += 1 << z
                 f.write("0x%02x," % value)
             f.write("\n")
-elif what == "4/4/4/4":
+    elif what == "4/4/4/4":
         colors = []
         f.write("%d,%d,\n" % (width, height))
         for y in range(height):
@@ -49,7 +48,7 @@ elif what == "4/4/4/4":
                 pixel = image.pixel(x, y)
                 f.write("0x%1x%1x%1x%1x," % (Qt.qAlpha(pixel) // 16, Qt.qRed(pixel) // 16, Qt.qGreen(pixel) // 16, Qt.qBlue(pixel) // 16))
             f.write("\n")
-elif what == "5/6/5/8":
+    elif what == "5/6/5/8":
         colors = []
         writeSize(f, width, height)
         for y in range(height):
@@ -59,7 +58,7 @@ elif what == "5/6/5/8":
                 # f.write("%d,%d,%d," % (val%256, val/256, Qt.qAlpha(pixel) >> 4))
                 f.write("%d,%d," % (val % 256, val // 256))
             f.write("\n")
-elif what == "4bits":
+    elif what == "4bits":
         colors = []
         writeSize(f, width, height)
         for y in range(0, height, 2):
@@ -77,7 +76,7 @@ elif what == "4bits":
                         value -= 1 << (4 + i)
                 f.write("0x%02x," % value)
             f.write("\n")
-elif what == "8bits":
+    elif what == "8bits":
         colors = []
         writeSize(f, width, height)
         for y in range(height):
@@ -86,7 +85,7 @@ elif what == "8bits":
                 value = 0x0f - (value >> 4)
                 f.write("0x%02x," % value)
             f.write("\n")
-elif what == "03x05":
+    elif what == "03x05":
         for y in range(0, height, 5):
             for x in range(width):
                 value = 0
@@ -95,7 +94,7 @@ elif what == "03x05":
                         value += 1 << z
                 f.write("0x%02x," % value)
             f.write("\n")
-elif what == "04x06":
+    elif what == "04x06":
         for y in range(0, height, 7):
             for x in range(width):
                 value = 0
@@ -106,7 +105,7 @@ elif what == "04x06":
                     value = 0xff
                 f.write("0x%02x," % value)
             f.write("\n")
-elif what == "05x07":
+    elif what == "05x07":
         for y in range(0, height, 8):
             for x in range(width):
                 value = 0
@@ -115,7 +114,7 @@ elif what == "05x07":
                         value += 1 << z
                 f.write("0x%02x," % value)
             f.write("\n")
-elif what == "08x10":
+    elif what == "08x10":
         for y in range(0, height, 12):
             for x in range(width):
                 skip = True
@@ -131,7 +130,7 @@ elif what == "08x10":
                         value = 0xff
                     f.write("0x%02x," % value)
             f.write("\n")
-elif what == "10x14":
+    elif what == "10x14":
         for y in range(0, height, 16):
             for x in range(width):
                 for l in range(0, 16, 8):
@@ -141,7 +140,7 @@ elif what == "10x14":
                             value += 1 << z
                     f.write("0x%02x," % value)
             f.write("\n")
-elif what == "22x38":
+    elif what == "22x38":
         for y in range(0, height, 40):
             for x in range(width):
                 for l in range(0, 40, 8):
@@ -151,5 +150,5 @@ elif what == "22x38":
                             value += 1 << z
                     f.write("0x%02x," % value)
             f.write("\n")
-else:
+    else:
         print("wrong argument", sys.argv[4])

radio/util/include-guard.py

@@ -6,9 +6,8 @@ import sys
 import os
 
 for filename in sys.argv[1:]:
-    f = file(filename, "r")
+    with open(filename, "r") as f:
         lines = f.readlines()
-    f.close()
 
     newguard = "_" + os.path.basename(filename).upper().replace(".", "_") + "_"
 
@@ -24,7 +23,6 @@ for filename in sys.argv[1:]:
                 while not lines[end].strip().startswith("#endif"):
                     end -= 1
                 lines[end] = "#endif // %s\n" % newguard
-                f = file(filename, "w")
+                with open(filename, "w") as f:
                     f.write("".join(lines))
-                f.close()
                 break

radio/util/luaexport.py

@@ -66,9 +66,8 @@ print("Output file %s" % outputFile)
 if docFile:
     print("Documentation file %s" % docFile)
 
-np = open(inputFile, "r")
+with open(inputFile, "r") as inp:
-
+    while True:
-while True:
         line = inp.readline()
         if len(line) == 0:
             break
@@ -101,51 +100,46 @@ while True:
             traceback.print_exc()
             error = True
 
-inp.close()
+with open(outputFile, "w") as out:
-
+    out.write("//This file was generated by luaexport.py script on %s for OpenTX version %s\n\n\n"
-out = open(outputFile, "w")
-
-out.write("//This file was generated by luaexport.py script on %s for OpenTX version %s\n\n\n"
               % (time.asctime(), version))
 
-header = """
+    header = """
-struct LuaSingleField {
+    struct LuaSingleField {
         uint16_t id;
         const char * name;
         const char * desc;
-};
+    };
 
-struct LuaMultipleField {
+    struct LuaMultipleField {
         uint16_t id;
         const char * name;
         const char * desc;
         uint8_t count;
-};
+    };
 
-"""
+    """
-out.write(header)
+    out.write(header)
 
-out.write("""
+    out.write("""
-// The list of Lua fields
+    // The list of Lua fields
-// this aray is alphabetically sorted by the second field (name)
+    // this aray is alphabetically sorted by the second field (name)
-const LuaSingleField luaSingleFields[] = {
+    const LuaSingleField luaSingleFields[] = {
-""")
+    """)
-exports.sort(key=lambda x: x[1])  # sort by name
+    exports.sort(key=lambda x: x[1])  # sort by name
-data = ["    {%s, \"%s\", \"%s\"}" % export for export in exports]
+    data = ["    {%s, \"%s\", \"%s\"}" % export for export in exports]
-out.write(",\n".join(data))
+    out.write(",\n".join(data))
-out.write("\n};\n\n")
+    out.write("\n};\n\n")
-print("Generated %d items in luaFields[]" % len(exports))
+    print("Generated %d items in luaFields[]" % len(exports))
 
-out.write("""
+    out.write("""
-// The list of Lua fields that have a range of values
+    // The list of Lua fields that have a range of values
-const LuaMultipleField luaMultipleFields[] = {
+    const LuaMultipleField luaMultipleFields[] = {
-""")
+    """)
-data = ["    {%s, \"%s\", \"%s\", %d}" % export for export in exports_multiple]
+    data = ["    {%s, \"%s\", \"%s\", %d}" % export for export in exports_multiple]
-out.write(",\n".join(data))
+    out.write(",\n".join(data))
-out.write("\n};\n\n")
+    out.write("\n};\n\n")
-print("Generated %d items in luaMultipleFields[]" % len(exports_multiple))
+    print("Generated %d items in luaMultipleFields[]" % len(exports_multiple))
-
-out.close()
 
 if docFile:
     # prepare fields
@@ -160,7 +154,7 @@ if docFile:
     alphanum_key = lambda key: [convert(c) for c in re.split('([0-9]+)', key[0])]
     all_exports.sort(key=alphanum_key)
 
-    out = open(docFile, "w")
+    with open(docFile, "w") as out:
         out.write("Alphabetical list of Lua fields for OpenTX version %s\n\n\n" % version)
         FIELD_NAME_WIDTH = 25
         out.write("Field name%sField description\n" % (' ' * (FIELD_NAME_WIDTH - len('Field name'))))
@@ -169,8 +163,6 @@ if docFile:
         out.write("\n".join(data))
         out.write("\n")
 
-    out.close()
-
 if warning:
     sys.exit(1)
 elif error: