diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-30 18:57:40 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-11-01 00:35:16 +0100 |
commit | d4c17700aa2f36f69978beda04e42ff2749de270 (patch) | |
tree | 466f774d5fff723d6496e7259529c366fe01855a /drivers | |
parent | 97c8508f5e4f57b1048830d44e76e1f4517fd449 (diff) | |
download | redot-engine-d4c17700aa2f36f69978beda04e42ff2749de270.tar.gz |
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 'drivers')
-rw-r--r-- | drivers/SCsub | 10 | ||||
-rw-r--r-- | drivers/gl_context/SCsub | 10 | ||||
-rw-r--r-- | drivers/png/SCsub | 8 | ||||
-rw-r--r-- | drivers/rtaudio/SCsub | 2 | ||||
-rw-r--r-- | drivers/unix/SCsub | 14 | ||||
-rw-r--r-- | drivers/zlib/SCsub | 2 |
6 files changed, 23 insertions, 23 deletions
diff --git a/drivers/SCsub b/drivers/SCsub index 27871bb337..4ff770c7d0 100644 --- a/drivers/SCsub +++ b/drivers/SCsub @@ -2,7 +2,7 @@ Import('env') -env.drivers_sources=[] +env.drivers_sources = [] if ("builtin_zlib" in env and env["builtin_zlib"] == "yes"): SConscript("zlib/SCsub"); @@ -28,15 +28,15 @@ SConscript("png/SCsub"); # Tools override # FIXME: Should likely be integrated in the tools/ codebase -if (env["tools"]=="yes"): +if (env["tools"] == "yes"): SConscript("convex_decomp/SCsub"); -if env['vsproj']=="yes": +if env['vsproj'] == "yes": env.AddToVSProject(env.drivers_sources) if env.split_drivers: env.split_lib("drivers") else: - env.add_source_files(env.drivers_sources,"*.cpp") - lib = env.Library("drivers",env.drivers_sources) + env.add_source_files(env.drivers_sources, "*.cpp") + lib = env.Library("drivers", env.drivers_sources) env.Prepend(LIBS=[lib]) diff --git a/drivers/gl_context/SCsub b/drivers/gl_context/SCsub index acdc3d52e8..efc925dae4 100644 --- a/drivers/gl_context/SCsub +++ b/drivers/gl_context/SCsub @@ -2,9 +2,9 @@ Import('env') -if (env["platform"] in ["haiku","osx","windows","x11"]): +if (env["platform"] in ["haiku", "osx", "windows", "x11"]): # Thirdparty source files - if (env["glew"] != "system"): # builtin + if (env["glew"] != "system"): # builtin thirdparty_dir = "#thirdparty/glew/" thirdparty_sources = [ "glew.c", @@ -12,10 +12,10 @@ if (env["platform"] in ["haiku","osx","windows","x11"]): thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env.add_source_files(env.drivers_sources, thirdparty_sources) - env.Append(CPPFLAGS = ['-DGLEW_STATIC']) - env.Append(CPPPATH = [thirdparty_dir]) + env.Append(CPPFLAGS=['-DGLEW_STATIC']) + env.Append(CPPPATH=[thirdparty_dir]) - env.Append(CPPFLAGS = ['-DGLEW_ENABLED']) + env.Append(CPPFLAGS=['-DGLEW_ENABLED']) # Godot source files env.add_source_files(env.drivers_sources, "*.cpp") diff --git a/drivers/png/SCsub b/drivers/png/SCsub index 6eabd8901d..d3ece65196 100644 --- a/drivers/png/SCsub +++ b/drivers/png/SCsub @@ -27,12 +27,12 @@ if (env["libpng"] == "builtin"): thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_png.add_source_files(env.drivers_sources, thirdparty_sources) - env_png.Append(CPPPATH = [thirdparty_dir]) + env_png.Append(CPPPATH=[thirdparty_dir]) # Currently .ASM filter_neon.S does not compile on NT. import os - if ("neon_enabled" in env and env["neon_enabled"]) and os.name!="nt": - env_png.Append(CPPFLAGS = ["-DPNG_ARM_NEON_OPT=2"]) + if ("neon_enabled" in env and env["neon_enabled"]) and os.name != "nt": + env_png.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=2"]) env_neon = env_png.Clone(); if "S_compiler" in env: env_neon['CC'] = env['S_compiler'] @@ -42,7 +42,7 @@ if (env["libpng"] == "builtin"): neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon.S")) env.drivers_sources += neon_sources else: - env_png.Append(CPPFLAGS = ["-DPNG_ARM_NEON_OPT=0"]) + env_png.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=0"]) # Godot source files env_png.add_source_files(env.drivers_sources, "*.cpp") diff --git a/drivers/rtaudio/SCsub b/drivers/rtaudio/SCsub index 704c4b6740..2b0a602965 100644 --- a/drivers/rtaudio/SCsub +++ b/drivers/rtaudio/SCsub @@ -12,7 +12,7 @@ thirdparty_sources = [ thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env.add_source_files(env.drivers_sources, thirdparty_sources) -env.Append(CPPPATH = [thirdparty_dir]) +env.Append(CPPPATH=[thirdparty_dir]) # Driver source files env.add_source_files(env.drivers_sources, "*.cpp") diff --git a/drivers/unix/SCsub b/drivers/unix/SCsub index fe427e747f..3766e782e4 100644 --- a/drivers/unix/SCsub +++ b/drivers/unix/SCsub @@ -2,13 +2,13 @@ Import('env') -g_set_p='#ifdef UNIX_ENABLED\n' -g_set_p+='#include "os_unix.h"\n' -g_set_p+='String OS_Unix::get_global_settings_path() const {\n' -g_set_p+='\treturn "' + env["unix_global_settings_path"]+'";\n' -g_set_p+='}\n' -g_set_p+='#endif' -f = open("os_unix_global_settings_path.cpp","wb") +g_set_p = '#ifdef UNIX_ENABLED\n' +g_set_p += '#include "os_unix.h"\n' +g_set_p += 'String OS_Unix::get_global_settings_path() const {\n' +g_set_p += '\treturn "' + env["unix_global_settings_path"] + '";\n' +g_set_p += '}\n' +g_set_p += '#endif' +f = open("os_unix_global_settings_path.cpp", "wb") f.write(g_set_p) f.close() diff --git a/drivers/zlib/SCsub b/drivers/zlib/SCsub index 928128e40c..407deb5f6e 100644 --- a/drivers/zlib/SCsub +++ b/drivers/zlib/SCsub @@ -23,4 +23,4 @@ thirdparty_sources = [ thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env.add_source_files(env.drivers_sources, thirdparty_sources) -env.Append(CPPPATH = [thirdparty_dir]) +env.Append(CPPPATH=[thirdparty_dir]) |