summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2016-11-01 00:24:30 +0100
committerRémi Verschelde <rverschelde@gmail.com>2016-11-01 00:35:16 +0100
commitf34151ff0f91e8f0df8eaf829334b2205eb7da3c (patch)
tree2d074bb474b4b093c849ad2f6317dcc4ae5784f5 /scene
parent817dd7ccbb166b27c93706dffc5c0c0d59fd87f8 (diff)
style: Various other PEP8 fixes in Python files
Done with `autopep8 --select=E7`, fixes: - E701 - Put colon-separated compound statement on separate lines. - E702 - Put semicolon-separated compound statement on separate lines. - E703 - Put semicolon-separated compound statement on separate lines. - E711 - Fix comparison with None. - E712 - Fix (trivial case of) comparison with boolean. - E713 - Fix (trivial case of) non-membership check. - E721 - Fix various deprecated code (via lib2to3).
Diffstat (limited to 'scene')
-rw-r--r--scene/SCsub16
-rw-r--r--scene/resources/SCsub2
-rw-r--r--scene/resources/default_theme/make_header.py50
3 files changed, 34 insertions, 34 deletions
diff --git a/scene/SCsub b/scene/SCsub
index 4a89eef469..bd2da1eab9 100644
--- a/scene/SCsub
+++ b/scene/SCsub
@@ -7,14 +7,14 @@ env.add_source_files(env.scene_sources, "*.cpp")
Export('env')
-SConscript('main/SCsub');
-SConscript('gui/SCsub');
-SConscript('3d/SCsub');
-SConscript('2d/SCsub');
-SConscript('animation/SCsub');
-SConscript('audio/SCsub');
-SConscript('resources/SCsub');
-SConscript('io/SCsub');
+SConscript('main/SCsub')
+SConscript('gui/SCsub')
+SConscript('3d/SCsub')
+SConscript('2d/SCsub')
+SConscript('animation/SCsub')
+SConscript('audio/SCsub')
+SConscript('resources/SCsub')
+SConscript('io/SCsub')
lib = env.Library("scene", env.scene_sources)
diff --git a/scene/resources/SCsub b/scene/resources/SCsub
index 9c1e72f04f..60b16cd0d4 100644
--- a/scene/resources/SCsub
+++ b/scene/resources/SCsub
@@ -7,4 +7,4 @@ env.add_source_files(env.scene_sources, "*.c")
Export('env')
-SConscript("default_theme/SCsub");
+SConscript("default_theme/SCsub")
diff --git a/scene/resources/default_theme/make_header.py b/scene/resources/default_theme/make_header.py
index 41d5e2e259..68c9e92527 100644
--- a/scene/resources/default_theme/make_header.py
+++ b/scene/resources/default_theme/make_header.py
@@ -1,71 +1,71 @@
-import os;
-import glob;
-import string;
+import os
+import glob
+import string
# Generate include files
f = open("theme_data.h", "wb")
-f.write("// THIS FILE HAS BEEN AUTOGENERATED, DONT EDIT!!\n");
+f.write("// THIS FILE HAS BEEN AUTOGENERATED, DONT EDIT!!\n")
-f.write("\n\n");
+f.write("\n\n")
# Generate png image block
-pixmaps = glob.glob("*.png");
+pixmaps = glob.glob("*.png")
-pixmaps.sort();
+pixmaps.sort()
-f.write("\n\n\n");
+f.write("\n\n\n")
for x in pixmaps:
- var_str = x[:-4] + "_png";
+ var_str = x[:-4] + "_png"
- f.write("static const unsigned char " + var_str + "[]={\n");
+ f.write("static const unsigned char " + var_str + "[]={\n")
- pngf = open(x, "rb");
+ pngf = open(x, "rb")
- b = pngf.read(1);
+ b = pngf.read(1)
while(len(b) == 1):
f.write(hex(ord(b)))
- b = pngf.read(1);
+ b = pngf.read(1)
if (len(b) == 1):
f.write(",")
- f.write("\n};\n\n\n");
- pngf.close();
+ f.write("\n};\n\n\n")
+ pngf.close()
# Generate shaders block
shaders = glob.glob("*.gsl")
-shaders.sort();
+shaders.sort()
-f.write("\n\n\n");
+f.write("\n\n\n")
for x in shaders:
- var_str = x[:-4] + "_shader_code";
+ var_str = x[:-4] + "_shader_code"
- f.write("static const char *" + var_str + "=\n");
+ f.write("static const char *" + var_str + "=\n")
- sf = open(x, "rb");
+ sf = open(x, "rb")
- b = sf.readline();
+ b = sf.readline()
while(b != ""):
if (b.endswith("\r\n")):
b = b[:-2]
if (b.endswith("\n")):
b = b[:-1]
f.write(" \"" + b)
- b = sf.readline();
+ b = sf.readline()
if (b != ""):
f.write("\"\n")
- f.write("\";\n\n\n");
- sf.close();
+ f.write("\";\n\n\n")
+ sf.close()
-f.close();
+f.close()