diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-30 18:44:57 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-01 00:33:51 +0100 |
commit | 97c8508f5e4f57b1048830d44e76e1f4517fd449 (patch) | |
tree | 3d6af30f519a2a7788e596f21d91f3ecfa399864 /tools/scripts | |
parent | 681575fa7123592897090c6cce44402c4e45baeb (diff) |
style: Start applying PEP8 to Python files, indentation issues
Done with `autopep8 --select=E1`, fixes:
- E101 - Reindent all lines.
- E112 - Fix under-indented comments.
- E113 - Fix over-indented comments.
- E115 - Fix under-indented comments.
- E116 - Fix over-indented comments.
- E121 - Fix a badly indented line.
- E122 - Fix a badly indented line.
- E123 - Fix a badly indented line.
- E124 - Fix a badly indented line.
- E125 - Fix indentation undistinguish from the next logical line.
- E126 - Fix a badly indented line.
- E127 - Fix a badly indented line.
- E128 - Fix a badly indented line.
- E129 - Fix a badly indented line.
Diffstat (limited to 'tools/scripts')
-rw-r--r-- | tools/scripts/addheader.py | 62 | ||||
-rwxr-xr-x | tools/scripts/file-hex-array.py | 56 | ||||
-rw-r--r-- | tools/scripts/make_bmfhdr.py | 64 | ||||
-rw-r--r-- | tools/scripts/make_glwrapper.py | 100 | ||||
-rw-r--r-- | tools/scripts/makeargs.py | 28 | ||||
-rw-r--r-- | tools/scripts/memsort.py | 24 | ||||
-rw-r--r-- | tools/scripts/svgs_2_pngs.py | 4 |
7 files changed, 169 insertions, 169 deletions
diff --git a/tools/scripts/addheader.py b/tools/scripts/addheader.py index d040d8b5d6..fac35372de 100644 --- a/tools/scripts/addheader.py +++ b/tools/scripts/addheader.py @@ -34,39 +34,39 @@ f = open("files","rb") fname = f.readline() while (fname!=""): - fr = open(fname.strip(),"rb") - l = fr.readline() - bc=False - fsingle = fname.strip() + fr = open(fname.strip(),"rb") + l = fr.readline() + bc=False + fsingle = fname.strip() - if (fsingle.find("/")!=-1): - fsingle=fsingle[fsingle.rfind("/")+1:] - rep_fl="$filename" - rep_fi=fsingle - len_fl=len(rep_fl) - len_fi=len(rep_fi) - if (len_fi<len_fl): - for x in range(len_fl-len_fi): - rep_fi+=" " - elif (len_fl<len_fi): - for x in range(len_fi-len_fl): - rep_fl+=" " - if (header.find(rep_fl)!=-1): - text=header.replace(rep_fl,rep_fi) - else: - text=header.replace("$filename",fsingle) + if (fsingle.find("/")!=-1): + fsingle=fsingle[fsingle.rfind("/")+1:] + rep_fl="$filename" + rep_fi=fsingle + len_fl=len(rep_fl) + len_fi=len(rep_fi) + if (len_fi<len_fl): + for x in range(len_fl-len_fi): + rep_fi+=" " + elif (len_fl<len_fi): + for x in range(len_fi-len_fl): + rep_fl+=" " + if (header.find(rep_fl)!=-1): + text=header.replace(rep_fl,rep_fi) + else: + text=header.replace("$filename",fsingle) - while (l!=""): - if ((l.find("//")!=0 and l.find("/*")!=0 and l.strip()!="") or bc): - text+=l - bc=True - l=fr.readline() + while (l!=""): + if ((l.find("//")!=0 and l.find("/*")!=0 and l.strip()!="") or bc): + text+=l + bc=True + l=fr.readline() - fr.close() - fr=open(fname.strip(),"wb") - fr.write(text) - fr.close() - #print(text) - fname=f.readline() + fr.close() + fr=open(fname.strip(),"wb") + fr.write(text) + fr.close() + #print(text) + fname=f.readline() diff --git a/tools/scripts/file-hex-array.py b/tools/scripts/file-hex-array.py index 05352396f1..f50dcd4e26 100755 --- a/tools/scripts/file-hex-array.py +++ b/tools/scripts/file-hex-array.py @@ -3,33 +3,33 @@ import os.path import sys def tof(filepath): - with open(filepath, 'r') as f: - content = f.read() - content = content.replace("0x","") - content = content.split(',') - for i in range(len(content)): - if len(content[i]) == 1: content[i] = "0" + content[i] - content = "".join(content) - with open(filepath+".file", 'wb') as f: - content = f.write(content.decode("hex")) - print(os.path.basename(filepath)+".file created.") - exit(0) + with open(filepath, 'r') as f: + content = f.read() + content = content.replace("0x","") + content = content.split(',') + for i in range(len(content)): + if len(content[i]) == 1: content[i] = "0" + content[i] + content = "".join(content) + with open(filepath+".file", 'wb') as f: + content = f.write(content.decode("hex")) + print(os.path.basename(filepath)+".file created.") + exit(0) def toa(filepath): - with open(filepath, 'rb') as f: - content = f.read() - content = binascii.hexlify(content) - content = [content[i:i+2] for i in range(0, len(content), 2)] - content = ",0x".join(content) - content = "0x" + content - content = content.replace("0x00","0x0") - with open(filepath+".array", 'w') as f: - content = f.write(content) - print(os.path.basename(filepath)+".array created.") - exit(0) + with open(filepath, 'rb') as f: + content = f.read() + content = binascii.hexlify(content) + content = [content[i:i+2] for i in range(0, len(content), 2)] + content = ",0x".join(content) + content = "0x" + content + content = content.replace("0x00","0x0") + with open(filepath+".array", 'w') as f: + content = f.write(content) + print(os.path.basename(filepath)+".array created.") + exit(0) def usage(): - print("========================================================\n\ + print("========================================================\n\ #\n\ # Usage: python file-hex-array.py [action] [option]\n\ #\n\ @@ -40,13 +40,13 @@ def usage(): # Example : python file-hex-array.py toa 1.png\n\ #\n\ ========================================================") - exit(1) + exit(1) if len(sys.argv) != 3: - usage() + usage() if sys.argv[1] == "toa" and os.path.isfile(sys.argv[2]): - toa(sys.argv[2]) + toa(sys.argv[2]) elif sys.argv[1] == "tof" and os.path.isfile(sys.argv[2]): - tof(sys.argv[2]) + tof(sys.argv[2]) else: - usage()
\ No newline at end of file + usage() diff --git a/tools/scripts/make_bmfhdr.py b/tools/scripts/make_bmfhdr.py index 0f6f453004..3fa97c8fe1 100644 --- a/tools/scripts/make_bmfhdr.py +++ b/tools/scripts/make_bmfhdr.py @@ -3,7 +3,7 @@ import sys if (len(sys.argv)!=2): - print("Pass me a .fnt argument!") + print("Pass me a .fnt argument!") f = open(sys.argv[1],"rb") @@ -19,39 +19,39 @@ font_cc=0 while(l!=""): - fs = l.strip().find(" ") - if (fs==-1): - l=f.readline() - continue - t = l[0:fs] + fs = l.strip().find(" ") + if (fs==-1): + l=f.readline() + continue + t = l[0:fs] - dv = l[fs+1:].split(" ") - d = {} - for x in dv: - if (x.find("=")==-1): - continue - s = x.split("=") - d[ s[0] ] = s[1] + dv = l[fs+1:].split(" ") + d = {} + for x in dv: + if (x.find("=")==-1): + continue + s = x.split("=") + d[ s[0] ] = s[1] - if (t=="common"): - font_height=d["lineHeight"] - font_ascent=d["base"] + if (t=="common"): + font_height=d["lineHeight"] + font_ascent=d["base"] - if (t=="char"): - font_chars.append(d["id"]) - font_chars.append(d["x"]) - font_chars.append(d["y"]) - font_chars.append(d["width"]) - font_chars.append(d["height"]) - font_chars.append(d["xoffset"]) - font_chars.append(d["yoffset"]) - font_chars.append(d["xadvance"]) - font_cc+=1 + if (t=="char"): + font_chars.append(d["id"]) + font_chars.append(d["x"]) + font_chars.append(d["y"]) + font_chars.append(d["width"]) + font_chars.append(d["height"]) + font_chars.append(d["xoffset"]) + font_chars.append(d["yoffset"]) + font_chars.append(d["xadvance"]) + font_cc+=1 - l = f.readline() + l = f.readline() print("static const int _bi_font_"+name+"_height="+str(font_height)+";") @@ -60,11 +60,11 @@ print("static const int _bi_font_"+name+"_charcount="+str(font_cc)+";") cstr="static const int _bi_font_"+name+"_characters={" for i in range(len(font_chars)): - c=font_chars[i] - if (i>0): - cstr+=", " - cstr+=c + c=font_chars[i] + if (i>0): + cstr+=", " + cstr+=c cstr+=("};") -print(cstr)
\ No newline at end of file +print(cstr) diff --git a/tools/scripts/make_glwrapper.py b/tools/scripts/make_glwrapper.py index b4c582f1eb..8da4e28c89 100644 --- a/tools/scripts/make_glwrapper.py +++ b/tools/scripts/make_glwrapper.py @@ -2,8 +2,8 @@ import sys if (len(sys.argv)<2): - print("usage: make_glwrapper.py <headers>") - sys.exit(255) + print("usage: make_glwrapper.py <headers>") + sys.exit(255) functions=[] @@ -17,16 +17,16 @@ READ_CONSTANTS=2 read_what=READ_TYPES for x in (range(len(sys.argv)-1)): - f=open(sys.argv[x+1],"r") + f=open(sys.argv[x+1],"r") - while(True): + while(True): - line=f.readline() - if (line==""): - break + line=f.readline() + if (line==""): + break - line=line.replace("\n","").strip() - """ + line=line.replace("\n","").strip() + """ if (line.find("[types]")!=-1): read_what=READ_TYPES continue @@ -38,53 +38,53 @@ for x in (range(len(sys.argv)-1)): continue """ - if (line.find("#define")!=-1): - if (line.find("0x")==-1 and line.find("GL_VERSION")==-1): - continue - constants.append(line) - elif (line.find("typedef")!=-1): - if (line.find("(")!=-1 or line.find(")")!=-1 or line.find("ARB")!=-1 or line.find("EXT")!=-1 or line.find("GL")==-1): - continue - types.append(line) - elif (line.find("APIENTRY")!=-1 and line.find("GLAPI")!=-1): + if (line.find("#define")!=-1): + if (line.find("0x")==-1 and line.find("GL_VERSION")==-1): + continue + constants.append(line) + elif (line.find("typedef")!=-1): + if (line.find("(")!=-1 or line.find(")")!=-1 or line.find("ARB")!=-1 or line.find("EXT")!=-1 or line.find("GL")==-1): + continue + types.append(line) + elif (line.find("APIENTRY")!=-1 and line.find("GLAPI")!=-1): - if (line.find("ARB")!=-1 or line.find("EXT")!=-1 or line.find("NV")!=-1): - continue + if (line.find("ARB")!=-1 or line.find("EXT")!=-1 or line.find("NV")!=-1): + continue - line=line.replace("APIENTRY","") - line=line.replace("GLAPI","") + line=line.replace("APIENTRY","") + line=line.replace("GLAPI","") - glpos=line.find(" gl") - if (glpos==-1): + glpos=line.find(" gl") + if (glpos==-1): - glpos=line.find("\tgl") - if (glpos==-1): - continue + glpos=line.find("\tgl") + if (glpos==-1): + continue - ret=line[:glpos].strip(); + ret=line[:glpos].strip(); - line=line[glpos:].strip() - namepos=line.find("(") + line=line[glpos:].strip() + namepos=line.find("(") - if (namepos==-1): - continue + if (namepos==-1): + continue - name=line[:namepos].strip() - line=line[namepos:] + name=line[:namepos].strip() + line=line[namepos:] - argpos=line.rfind(")") - if (argpos==-1): - continue + argpos=line.rfind(")") + if (argpos==-1): + continue - args=line[1:argpos] + args=line[1:argpos] - funcdata={} - funcdata["ret"]=ret - funcdata["name"]=name - funcdata["args"]=args + funcdata={} + funcdata["ret"]=ret + funcdata["name"]=name + funcdata["args"]=args - functions.append(funcdata) - print(funcdata) + functions.append(funcdata) + print(funcdata) @@ -137,18 +137,18 @@ f.write("#else\n"); f.write("#define GLWRP_APIENTRY \n") f.write("#endif\n\n"); for x in types: - f.write(x+"\n") + f.write(x+"\n") f.write("\n\n") for x in constants: - f.write(x+"\n") + f.write(x+"\n") f.write("\n\n") for x in functions: - f.write("extern "+x["ret"]+" GLWRP_APIENTRY (*__wrapper_"+x["name"]+")("+x["args"]+");\n") - f.write("#define "+x["name"]+" __wrapper_"+x["name"]+"\n") + f.write("extern "+x["ret"]+" GLWRP_APIENTRY (*__wrapper_"+x["name"]+")("+x["args"]+");\n") + f.write("#define "+x["name"]+" __wrapper_"+x["name"]+"\n") f.write("\n\n") f.write("typedef void (*GLWrapperFuncPtr)(void);\n\n"); @@ -165,14 +165,14 @@ f.write("#include \"glwrapper.h\"\n") f.write("\n\n") for x in functions: - f.write(x["ret"]+" GLWRP_APIENTRY (*__wrapper_"+x["name"]+")("+x["args"]+")=NULL;\n") + f.write(x["ret"]+" GLWRP_APIENTRY (*__wrapper_"+x["name"]+")("+x["args"]+")=NULL;\n") f.write("\n\n") f.write("void glWrapperInit( GLWrapperFuncPtr (*wrapperFunc)(const char*) ) {\n") f.write("\n") for x in functions: - f.write("\t__wrapper_"+x["name"]+"=("+x["ret"]+" GLWRP_APIENTRY (*)("+x["args"]+"))wrapperFunc(\""+x["name"]+"\");\n") + f.write("\t__wrapper_"+x["name"]+"=("+x["ret"]+" GLWRP_APIENTRY (*)("+x["args"]+"))wrapperFunc(\""+x["name"]+"\");\n") f.write("\n\n") f.write("}\n") diff --git a/tools/scripts/makeargs.py b/tools/scripts/makeargs.py index 8c5539c5fe..7db9da82a8 100644 --- a/tools/scripts/makeargs.py +++ b/tools/scripts/makeargs.py @@ -67,20 +67,20 @@ text=""" for i in range(1,8): - tp="" - p="" - t="" - for j in range(i): - if (j>0): - tp+=", " - p+=", " - t+=", " - tp +=("m_arg"+str(j+1)+" p"+str(j+1)) - p+=("p"+str(j+1)) - t+=("m_arg"+str(j+1)) - - t = text.replace("$argtp",tp).replace("$argp",p).replace("$argt",t).replace("$num",str(i)) - print(t) + tp="" + p="" + t="" + for j in range(i): + if (j>0): + tp+=", " + p+=", " + t+=", " + tp +=("m_arg"+str(j+1)+" p"+str(j+1)) + p+=("p"+str(j+1)) + t+=("m_arg"+str(j+1)) + + t = text.replace("$argtp",tp).replace("$argp",p).replace("$argt",t).replace("$num",str(i)) + print(t) diff --git a/tools/scripts/memsort.py b/tools/scripts/memsort.py index d2e4fe0226..15b4e7a84b 100644 --- a/tools/scripts/memsort.py +++ b/tools/scripts/memsort.py @@ -4,7 +4,7 @@ import sys arg="memdump.txt" if (len(sys.argv)>1): - arg=sys.argv[1] + arg=sys.argv[1] f = open(arg,"rb") @@ -18,18 +18,18 @@ cnt={} while(l!=""): - s=l.split("-") - amount = int(s[1]) - what=s[2] - if (what in sum): - sum[what]+=amount - cnt[what]+=1 - else: - sum[what]=amount - cnt[what]=1 + s=l.split("-") + amount = int(s[1]) + what=s[2] + if (what in sum): + sum[what]+=amount + cnt[what]+=1 + else: + sum[what]=amount + cnt[what]=1 - l=f.readline() + l=f.readline() for x in sum: - print(x.strip()+"("+str(cnt[x])+"):\n: "+str(sum[x])) + print(x.strip()+"("+str(cnt[x])+"):\n: "+str(sum[x])) diff --git a/tools/scripts/svgs_2_pngs.py b/tools/scripts/svgs_2_pngs.py index 879926ab42..4de69a14b4 100644 --- a/tools/scripts/svgs_2_pngs.py +++ b/tools/scripts/svgs_2_pngs.py @@ -130,8 +130,8 @@ special_icons = { } theme_icons = { - 'icon_close': dict(output_names=['close', 'close_hl']), - 'tab_menu': dict(output_names=['tab_menu_hl']) + 'icon_close': dict(output_names=['close', 'close_hl']), + 'tab_menu': dict(output_names=['tab_menu_hl']) } export_icons() |