aboutsummaryrefslogtreecommitdiff
path: root/tools/editor
diff options
context:
space:
mode:
authorRémi Verschelde2016-11-02 22:28:28 +0100
committerRémi Verschelde2016-11-02 22:28:28 +0100
commite259bf8bbb00c5555675892295ce50aa32695737 (patch)
tree88581c1ac2eaf04c9204bde9e6be156530f10884 /tools/editor
parent561c1f17a12a42b8263ce7dd40d90e1e9633c1de (diff)
downloadgodot-e259bf8bbb00c5555675892295ce50aa32695737.tar.gz
godot-e259bf8bbb00c5555675892295ce50aa32695737.tar.zst
godot-e259bf8bbb00c5555675892295ce50aa32695737.zip
style: Fix PEP8 whitespace issues in Python files
Done with `autopep8 --select=E2,W2`, fixes: - E201 - Remove extraneous whitespace. - E202 - Remove extraneous whitespace. - E203 - Remove extraneous whitespace. - E211 - Remove extraneous whitespace. - E221 - Fix extraneous whitespace around keywords. - E222 - Fix extraneous whitespace around keywords. - E223 - Fix extraneous whitespace around keywords. - E224 - Remove extraneous whitespace around operator. - E225 - Fix missing whitespace around operator. - E226 - Fix missing whitespace around operator. - E227 - Fix missing whitespace around operator. - E228 - Fix missing whitespace around operator. - E231 - Add missing whitespace. - E231 - Fix various deprecated code (via lib2to3). - E241 - Fix extraneous whitespace around keywords. - E242 - Remove extraneous whitespace around operator. - E251 - Remove whitespace around parameter '=' sign. - E261 - Fix spacing after comment hash. - E262 - Fix spacing after comment hash. - E265 - Format block comments. - E271 - Fix extraneous whitespace around keywords. - E272 - Fix extraneous whitespace around keywords. - E273 - Fix extraneous whitespace around keywords. - E274 - Fix extraneous whitespace around keywords. - W291 - Remove trailing whitespace. - W293 - Remove trailing whitespace.
Diffstat (limited to 'tools/editor')
-rw-r--r--tools/editor/SCsub52
-rw-r--r--tools/editor/fileserver/SCsub2
-rw-r--r--tools/editor/icons/SCsub56
-rw-r--r--tools/editor/io_plugins/SCsub2
-rw-r--r--tools/editor/plugins/SCsub2
5 files changed, 57 insertions, 57 deletions
diff --git a/tools/editor/SCsub b/tools/editor/SCsub
index 41b4386e2..0dbb7d3f2 100644
--- a/tools/editor/SCsub
+++ b/tools/editor/SCsub
@@ -3,12 +3,12 @@
Import('env')
-def make_doc_header(target,source,env):
+def make_doc_header(target, source, env):
src = source[0].srcnode().abspath
dst = target[0].srcnode().abspath
- f = open(src,"rb")
- g = open(dst,"wb")
+ f = open(src, "rb")
+ g = open(dst, "wb")
buf = f.read()
decomp_size = len(buf)
import zlib
@@ -18,22 +18,22 @@ def make_doc_header(target,source,env):
g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
g.write("#ifndef _DOC_DATA_RAW_H\n")
g.write("#define _DOC_DATA_RAW_H\n")
- g.write("static const int _doc_data_compressed_size="+str(len(buf))+";\n")
- g.write("static const int _doc_data_uncompressed_size="+str(decomp_size)+";\n")
+ g.write("static const int _doc_data_compressed_size=" + str(len(buf)) + ";\n")
+ g.write("static const int _doc_data_uncompressed_size=" + str(decomp_size) + ";\n")
g.write("static const unsigned char _doc_data_compressed[]={\n")
for i in range(len(buf)):
- g.write(str(ord(buf[i]))+",\n")
+ g.write(str(ord(buf[i])) + ",\n")
g.write("};\n")
g.write("#endif")
-def make_certs_header(target,source,env):
+def make_certs_header(target, source, env):
src = source[0].srcnode().abspath
dst = target[0].srcnode().abspath
- f = open(src,"rb")
- g = open(dst,"wb")
+ f = open(src, "rb")
+ g = open(dst, "wb")
buf = f.read()
decomp_size = len(buf)
import zlib
@@ -43,11 +43,11 @@ def make_certs_header(target,source,env):
g.write("/* THIS FILE IS GENERATED DO NOT EDIT */\n")
g.write("#ifndef _CERTS_RAW_H\n")
g.write("#define _CERTS_RAW_H\n")
- g.write("static const int _certs_compressed_size="+str(len(buf))+";\n")
- g.write("static const int _certs_uncompressed_size="+str(decomp_size)+";\n")
+ g.write("static const int _certs_compressed_size=" + str(len(buf)) + ";\n")
+ g.write("static const int _certs_uncompressed_size=" + str(decomp_size) + ";\n")
g.write("static const unsigned char _certs_compressed[]={\n")
for i in range(len(buf)):
- g.write(str(ord(buf[i]))+",\n")
+ g.write(str(ord(buf[i])) + ",\n")
g.write("};\n")
g.write("#endif")
@@ -57,29 +57,29 @@ def make_certs_header(target,source,env):
-if (env["tools"]=="yes"):
+if (env["tools"] == "yes"):
- reg_exporters_inc='#include "register_exporters.h"\n'
- reg_exporters='void register_exporters() {\n'
+ reg_exporters_inc = '#include "register_exporters.h"\n'
+ reg_exporters = 'void register_exporters() {\n'
for e in env.platform_exporters:
- env.tool_sources.append("#platform/"+e+"/export/export.cpp")
- reg_exporters+='\tregister_'+e+'_exporter();\n'
- reg_exporters_inc+='#include "platform/'+e+'/export/export.h"\n'
- reg_exporters+='}\n'
- f = open("register_exporters.cpp","wb")
+ env.tool_sources.append("#platform/" + e + "/export/export.cpp")
+ reg_exporters += '\tregister_' + e + '_exporter();\n'
+ reg_exporters_inc += '#include "platform/' + e + '/export/export.h"\n'
+ reg_exporters += '}\n'
+ f = open("register_exporters.cpp", "wb")
f.write(reg_exporters_inc)
f.write(reg_exporters)
f.close()
- env.Depends("#tools/editor/doc_data_compressed.h","#doc/base/classes.xml")
- env.Command("#tools/editor/doc_data_compressed.h","#doc/base/classes.xml",make_doc_header)
+ env.Depends("#tools/editor/doc_data_compressed.h", "#doc/base/classes.xml")
+ env.Command("#tools/editor/doc_data_compressed.h", "#doc/base/classes.xml", make_doc_header)
- env.Depends("#tools/editor/certs_compressed.h","#tools/certs/ca-certificates.crt")
- env.Command("#tools/editor/certs_compressed.h","#tools/certs/ca-certificates.crt",make_certs_header)
+ env.Depends("#tools/editor/certs_compressed.h", "#tools/certs/ca-certificates.crt")
+ env.Command("#tools/editor/certs_compressed.h", "#tools/certs/ca-certificates.crt", make_certs_header)
- #make_doc_header(env.File("#tools/editor/doc_data_raw.h").srcnode().abspath,env.File("#doc/base/classes.xml").srcnode().abspath,env)
+ # make_doc_header(env.File("#tools/editor/doc_data_raw.h").srcnode().abspath,env.File("#doc/base/classes.xml").srcnode().abspath,env)
- env.add_source_files(env.tool_sources,"*.cpp")
+ env.add_source_files(env.tool_sources, "*.cpp")
Export('env')
SConscript('icons/SCsub');
diff --git a/tools/editor/fileserver/SCsub b/tools/editor/fileserver/SCsub
index 6299fd416..4bf55189c 100644
--- a/tools/editor/fileserver/SCsub
+++ b/tools/editor/fileserver/SCsub
@@ -2,4 +2,4 @@
Import('env')
Export('env')
-env.add_source_files(env.tool_sources,"*.cpp")
+env.add_source_files(env.tool_sources, "*.cpp")
diff --git a/tools/editor/icons/SCsub b/tools/editor/icons/SCsub
index 495245de1..8845797ea 100644
--- a/tools/editor/icons/SCsub
+++ b/tools/editor/icons/SCsub
@@ -16,47 +16,47 @@ def make_editor_icons_action(target, source, env):
s.write("#include \"editor_scale.h\"\n\n")
s.write("#include \"scene/resources/theme.h\"\n\n")
- hidpi_list=[]
+ hidpi_list = []
for x in pixmaps:
- x=str(x)
- var_str=os.path.basename(x)[:-4]+"_png";
- #print(var_str)
+ x = str(x)
+ var_str = os.path.basename(x)[:-4] + "_png";
+ # print(var_str)
- s.write("static const unsigned char "+ var_str +"[]={\n");
+ s.write("static const unsigned char " + var_str + "[]={\n");
- pngf=open(x,"rb");
+ pngf = open(x, "rb");
- b=pngf.read(1);
- while(len(b)==1):
+ b = pngf.read(1);
+ while(len(b) == 1):
s.write(hex(ord(b)))
- b=pngf.read(1);
- if (len(b)==1):
+ b = pngf.read(1);
+ if (len(b) == 1):
s.write(",")
s.write("\n};\n\n");
pngf.close();
- var_str=os.path.basename(x)[:-4]+"_hidpi_png";
+ var_str = os.path.basename(x)[:-4] + "_hidpi_png";
try:
- pngf = open(os.path.dirname(x)+"/2x/"+os.path.basename(x), "rb")
+ pngf = open(os.path.dirname(x) + "/2x/" + os.path.basename(x), "rb")
- s.write("static const unsigned char "+ var_str +"[]={\n");
+ s.write("static const unsigned char " + var_str + "[]={\n");
- b=pngf.read(1);
- while(len(b)==1):
+ b = pngf.read(1);
+ while(len(b) == 1):
s.write(hex(ord(b)))
- b=pngf.read(1);
- if (len(b)==1):
+ b = pngf.read(1);
+ if (len(b) == 1):
s.write(",")
s.write("\n};\n\n\n");
hidpi_list.append(x)
except:
- s.write("static const unsigned char* "+ var_str +"=NULL;\n\n\n");
+ s.write("static const unsigned char* " + var_str + "=NULL;\n\n\n");
@@ -73,24 +73,24 @@ def make_editor_icons_action(target, source, env):
for x in pixmaps:
- x=os.path.basename(str(x))
- type=x[5:-4].title().replace("_","");
- var_str=x[:-4]+"_png";
- var_str_hidpi=x[:-4]+"_hidpi_png";
- s.write("\tp_theme->set_icon(\""+type+"\",\"EditorIcons\",make_icon("+var_str+","+var_str_hidpi+"));\n");
+ x = os.path.basename(str(x))
+ type = x[5:-4].title().replace("_", "");
+ var_str = x[:-4] + "_png";
+ var_str_hidpi = x[:-4] + "_hidpi_png";
+ s.write("\tp_theme->set_icon(\"" + type + "\",\"EditorIcons\",make_icon(" + var_str + "," + var_str_hidpi + "));\n");
s.write("\n\n}\n\n");
- f = open(dst,"wb")
+ f = open(dst, "wb")
f.write(s.getvalue())
f.close()
s.close()
make_editor_icons_builder = Builder(action=make_editor_icons_action,
- suffix = '.cpp',
- src_suffix = '.png')
-env['BUILDERS']['MakeEditorIconsBuilder']=make_editor_icons_builder
-env.Alias('editor_icons',[env.MakeEditorIconsBuilder('#tools/editor/editor_icons.cpp',Glob("*.png"))])
+ suffix='.cpp',
+ src_suffix='.png')
+env['BUILDERS']['MakeEditorIconsBuilder'] = make_editor_icons_builder
+env.Alias('editor_icons', [env.MakeEditorIconsBuilder('#tools/editor/editor_icons.cpp', Glob("*.png"))])
env.tool_sources.append("#tools/editor/editor_icons.cpp")
Export('env')
diff --git a/tools/editor/io_plugins/SCsub b/tools/editor/io_plugins/SCsub
index 6299fd416..4bf55189c 100644
--- a/tools/editor/io_plugins/SCsub
+++ b/tools/editor/io_plugins/SCsub
@@ -2,4 +2,4 @@
Import('env')
Export('env')
-env.add_source_files(env.tool_sources,"*.cpp")
+env.add_source_files(env.tool_sources, "*.cpp")
diff --git a/tools/editor/plugins/SCsub b/tools/editor/plugins/SCsub
index 6299fd416..4bf55189c 100644
--- a/tools/editor/plugins/SCsub
+++ b/tools/editor/plugins/SCsub
@@ -2,4 +2,4 @@
Import('env')
Export('env')
-env.add_source_files(env.tool_sources,"*.cpp")
+env.add_source_files(env.tool_sources, "*.cpp")