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 /modules | |
parent | 97c8508f5e4f57b1048830d44e76e1f4517fd449 (diff) |
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 'modules')
-rw-r--r-- | modules/SCsub | 10 | ||||
-rw-r--r-- | modules/enet/SCsub | 4 | ||||
-rw-r--r-- | modules/etc1/SCsub | 2 | ||||
-rw-r--r-- | modules/freetype/SCsub | 14 | ||||
-rw-r--r-- | modules/jpg/SCsub | 2 | ||||
-rw-r--r-- | modules/mpc/SCsub | 4 | ||||
-rw-r--r-- | modules/ogg/SCsub | 4 | ||||
-rw-r--r-- | modules/openssl/SCsub | 14 | ||||
-rw-r--r-- | modules/opus/SCsub | 12 | ||||
-rw-r--r-- | modules/pvr/SCsub | 2 | ||||
-rw-r--r-- | modules/squish/SCsub | 4 | ||||
-rw-r--r-- | modules/theora/SCsub | 14 | ||||
-rw-r--r-- | modules/vorbis/SCsub | 8 | ||||
-rw-r--r-- | modules/webm/SCsub | 16 | ||||
-rw-r--r-- | modules/webm/libvpx/SCsub | 4 | ||||
-rw-r--r-- | modules/webm/libvpx/yasm_osx_fat.py | 4 | ||||
-rw-r--r-- | modules/webp/SCsub | 4 |
17 files changed, 61 insertions, 61 deletions
diff --git a/modules/SCsub b/modules/SCsub index 76ba911612..4b9c08cf78 100644 --- a/modules/SCsub +++ b/modules/SCsub @@ -6,18 +6,18 @@ env_modules = env.Clone() Export('env_modules') -env.modules_sources=[ +env.modules_sources = [ "register_module_types.cpp", ] -#env.add_source_files(env.modules_sources,"*.cpp") +# env.add_source_files(env.modules_sources,"*.cpp") Export('env') for x in env.module_list: if (x in env.disabled_modules): continue - env_modules.Append(CPPFLAGS=["-DMODULE_"+x.upper()+"_ENABLED"]) - SConscript(x+"/SCsub") + env_modules.Append(CPPFLAGS=["-DMODULE_" + x.upper() + "_ENABLED"]) + SConscript(x + "/SCsub") -lib = env_modules.Library("modules",env.modules_sources) +lib = env_modules.Library("modules", env.modules_sources) env.Prepend(LIBS=[lib]) diff --git a/modules/enet/SCsub b/modules/enet/SCsub index 14aa59fdb8..8188107603 100644 --- a/modules/enet/SCsub +++ b/modules/enet/SCsub @@ -7,7 +7,7 @@ Import('env_modules') env_enet = env_modules.Clone() -if (env["enet"] != "system"): # builtin +if (env["enet"] != "system"): # builtin thirdparty_dir = "#thirdparty/enet/" thirdparty_sources = [ "callbacks.c", @@ -23,6 +23,6 @@ if (env["enet"] != "system"): # builtin thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_enet.add_source_files(env.modules_sources, thirdparty_sources) - env_enet.Append(CPPPATH = [thirdparty_dir]) + env_enet.Append(CPPPATH=[thirdparty_dir]) env_enet.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/etc1/SCsub b/modules/etc1/SCsub index 3d19e7c9a7..0c5dc66d2e 100644 --- a/modules/etc1/SCsub +++ b/modules/etc1/SCsub @@ -14,7 +14,7 @@ thirdparty_sources = [ thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_etc1.add_source_files(env.modules_sources, thirdparty_sources) -env_etc1.Append(CPPPATH = [thirdparty_dir]) +env_etc1.Append(CPPPATH=[thirdparty_dir]) # Godot source files env_etc1.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub index 0e21deac6a..c68c40265c 100644 --- a/modules/freetype/SCsub +++ b/modules/freetype/SCsub @@ -5,7 +5,7 @@ Import('env') # Not building in a separate env as core needs it # Thirdparty source files -if (env["freetype"] != "system"): # builtin +if (env["freetype"] != "system"): # builtin thirdparty_dir = "#thirdparty/freetype/" thirdparty_sources = [ "src/autofit/autofit.c", @@ -56,13 +56,13 @@ if (env["freetype"] != "system"): # builtin # Include header for WinRT to fix build issues if "platform" in env and env["platform"] == "winrt": - env.Append(CCFLAGS = ['/FI', '"modules/freetype/winrtdef.h"']) + env.Append(CCFLAGS=['/FI', '"modules/freetype/winrtdef.h"']) - env.Append(CPPPATH = [thirdparty_dir, thirdparty_dir + "/include"]) + env.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "/include"]) # also requires libpng headers - if (env["libpng"] != "system"): # builtin - env.Append(CPPPATH = ["#thirdparty/libpng"]) + if (env["libpng"] != "system"): # builtin + env.Append(CPPPATH=["#thirdparty/libpng"]) """ FIXME: Remove this commented code if Windows can handle the monolithic lib # fix for Windows' shell miserably failing on long lines, split in two libraries @@ -81,10 +81,10 @@ if (env["freetype"] != "system"): # builtin """ lib = env.Library("freetype_builtin", thirdparty_sources) - env.Append(LIBS = [lib]) + env.Append(LIBS=[lib]) # Godot source files env.add_source_files(env.modules_sources, "*.cpp") -env.Append(CCFLAGS = ['-DFREETYPE_ENABLED']) +env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) Export('env') diff --git a/modules/jpg/SCsub b/modules/jpg/SCsub index 1ecc9c0fd6..e72dc6a1ca 100644 --- a/modules/jpg/SCsub +++ b/modules/jpg/SCsub @@ -14,7 +14,7 @@ thirdparty_sources = [ thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_jpg.add_source_files(env.modules_sources, thirdparty_sources) -env_jpg.Append(CPPPATH = [thirdparty_dir]) +env_jpg.Append(CPPPATH=[thirdparty_dir]) # Godot's own source files env_jpg.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/mpc/SCsub b/modules/mpc/SCsub index deadf8687d..80d2ab4abe 100644 --- a/modules/mpc/SCsub +++ b/modules/mpc/SCsub @@ -6,7 +6,7 @@ Import('env_modules') env_mpc = env_modules.Clone() # Thirdparty source files -if (env["libmpcdec"] != "system"): # builtin +if (env["libmpcdec"] != "system"): # builtin thirdparty_dir = "#thirdparty/libmpcdec/" thirdparty_sources = [ "huffman.c", @@ -22,7 +22,7 @@ if (env["libmpcdec"] != "system"): # builtin thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_mpc.add_source_files(env.modules_sources, thirdparty_sources) - env_mpc.Append(CPPPATH = [thirdparty_dir]) + env_mpc.Append(CPPPATH=[thirdparty_dir]) # Godot source files env_mpc.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/ogg/SCsub b/modules/ogg/SCsub index 3946e54842..719ee4662b 100644 --- a/modules/ogg/SCsub +++ b/modules/ogg/SCsub @@ -6,7 +6,7 @@ Import('env_modules') env_ogg = env_modules.Clone() # Thirdparty source files -if (env["libogg"] != "system"): # builtin +if (env["libogg"] != "system"): # builtin thirdparty_dir = "#thirdparty/libogg/" thirdparty_sources = [ "bitwise.c", @@ -15,7 +15,7 @@ if (env["libogg"] != "system"): # builtin thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_ogg.add_source_files(env.modules_sources, thirdparty_sources) - env_ogg.Append(CPPPATH = [thirdparty_dir]) + env_ogg.Append(CPPPATH=[thirdparty_dir]) # Godot source files env_ogg.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/openssl/SCsub b/modules/openssl/SCsub index 325816fb19..75ea9b6bde 100644 --- a/modules/openssl/SCsub +++ b/modules/openssl/SCsub @@ -6,7 +6,7 @@ Import('env_modules') env_openssl = env_modules.Clone() # Thirdparty source files -if (env["openssl"] != "system"): # builtin +if (env["openssl"] != "system"): # builtin thirdparty_dir = "#thirdparty/openssl/" thirdparty_sources = [ @@ -664,15 +664,15 @@ if (env["openssl"] != "system"): # builtin "crypto/modes", "openssl", ] - env_openssl.Append(CPPPATH = [thirdparty_dir + "/" + dir for dir in thirdparty_include_paths]) + env_openssl.Append(CPPPATH=[thirdparty_dir + "/" + dir for dir in thirdparty_include_paths]) - env_openssl.Append(CPPFLAGS = ["-DOPENSSL_NO_ASM", "-DOPENSSL_THREADS", "-DL_ENDIAN"]) + env_openssl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM", "-DOPENSSL_THREADS", "-DL_ENDIAN"]) # Workaround for compilation error with GCC/Clang when -Werror is too greedy (GH-4517) import os import methods - if not (os.name=="nt" and os.getenv("VCINSTALLDIR")): # not Windows and not MSVC - env_openssl.Append(CFLAGS = ["-Wno-error=implicit-function-declaration"]) + if not (os.name == "nt" and os.getenv("VCINSTALLDIR")): # not Windows and not MSVC + env_openssl.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]) # Module sources @@ -681,7 +681,7 @@ env_openssl.add_source_files(env.modules_sources, "*.c") # platform/winrt need to know openssl is available, pass to main env if "platform" in env and env["platform"] == "winrt": - env.Append(CPPPATH = [thirdparty_dir]) - env.Append(CPPFLAGS = ['-DOPENSSL_ENABLED']); + env.Append(CPPPATH=[thirdparty_dir]) + env.Append(CPPFLAGS=['-DOPENSSL_ENABLED']); Export('env') diff --git a/modules/opus/SCsub b/modules/opus/SCsub index 2cfd439ebe..e116fc4607 100644 --- a/modules/opus/SCsub +++ b/modules/opus/SCsub @@ -6,7 +6,7 @@ Import('env_modules') env_opus = env_modules.Clone() # Thirdparty source files -if (env["opus"] != "system"): # builtin +if (env["opus"] != "system"): # builtin thirdparty_dir = "#thirdparty/opus/" thirdparty_sources = [ @@ -129,8 +129,8 @@ if (env["opus"] != "system"): # builtin opus_sources_silk = [] - if("opus_fixed_point" in env and env.opus_fixed_point=="yes"): - env_opus.Append(CFLAGS = ["-DFIXED_POINT"]) + if("opus_fixed_point" in env and env.opus_fixed_point == "yes"): + env_opus.Append(CFLAGS=["-DFIXED_POINT"]) opus_sources_silk = [ "silk/fixed/schur64_FIX.c", "silk/fixed/residual_energy16_FIX.c", @@ -205,11 +205,11 @@ if (env["opus"] != "system"): # builtin "silk/fixed", "silk/float", ] - env_opus.Append(CPPPATH = [thirdparty_dir + "/" + dir for dir in thirdparty_include_paths]) + env_opus.Append(CPPPATH=[thirdparty_dir + "/" + dir for dir in thirdparty_include_paths]) # also requires libogg - if (env["libogg"] != "system"): # builtin - env_opus.Append(CPPPATH = ["#thirdparty/libogg"]) + if (env["libogg"] != "system"): # builtin + env_opus.Append(CPPPATH=["#thirdparty/libogg"]) # Module files env_opus.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/pvr/SCsub b/modules/pvr/SCsub index 04a69cfa23..ddca7a794e 100644 --- a/modules/pvr/SCsub +++ b/modules/pvr/SCsub @@ -18,7 +18,7 @@ thirdparty_sources = [ thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_pvr.add_source_files(env.modules_sources, thirdparty_sources) -env_pvr.Append(CPPPATH = [thirdparty_dir]) +env_pvr.Append(CPPPATH=[thirdparty_dir]) # Godot source files env_pvr.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/squish/SCsub b/modules/squish/SCsub index 116fc0bb7f..462b6a05cf 100644 --- a/modules/squish/SCsub +++ b/modules/squish/SCsub @@ -6,7 +6,7 @@ Import('env_modules') env_squish = env_modules.Clone() # Thirdparty source files -if (env["squish"] != "system"): # builtin +if (env["squish"] != "system"): # builtin thirdparty_dir = "#thirdparty/squish/" thirdparty_sources = [ "alpha.cpp", @@ -23,7 +23,7 @@ if (env["squish"] != "system"): # builtin thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_squish.add_source_files(env.modules_sources, thirdparty_sources) - env_squish.Append(CPPPATH = [thirdparty_dir]) + env_squish.Append(CPPPATH=[thirdparty_dir]) # Godot source files env_squish.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/theora/SCsub b/modules/theora/SCsub index cbd19ee6d6..ff34b85879 100644 --- a/modules/theora/SCsub +++ b/modules/theora/SCsub @@ -6,7 +6,7 @@ Import('env_modules') env_theora = env_modules.Clone() # Thirdparty source files -if (env["libtheora"] != "system"): # builtin +if (env["libtheora"] != "system"): # builtin thirdparty_dir = "#thirdparty/libtheora/" thirdparty_sources = [ #"analyze.c", @@ -66,18 +66,18 @@ if (env["libtheora"] != "system"): # builtin thirdparty_sources += thirdparty_sources_x86_vc if (env["x86_libtheora_opt_gcc"] or env["x86_libtheora_opt_vc"]): - env_theora.Append(CCFLAGS = ["-DOC_X86_ASM"]) + env_theora.Append(CCFLAGS=["-DOC_X86_ASM"]) thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_theora.add_source_files(env.modules_sources, thirdparty_sources) - env_theora.Append(CPPPATH = [thirdparty_dir]) + env_theora.Append(CPPPATH=[thirdparty_dir]) # also requires libogg and libvorbis - if (env["libogg"] != "system"): # builtin - env_theora.Append(CPPPATH = ["#thirdparty/libogg"]) - if (env["libvorbis"] != "system"): # builtin - env_theora.Append(CPPPATH = ["#thirdparty/libvorbis"]) + if (env["libogg"] != "system"): # builtin + env_theora.Append(CPPPATH=["#thirdparty/libogg"]) + if (env["libvorbis"] != "system"): # builtin + env_theora.Append(CPPPATH=["#thirdparty/libvorbis"]) # Godot source files env_theora.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/vorbis/SCsub b/modules/vorbis/SCsub index 4189e119cf..3bd092105e 100644 --- a/modules/vorbis/SCsub +++ b/modules/vorbis/SCsub @@ -6,7 +6,7 @@ Import('env_modules') env_vorbis = env_modules.Clone() # Thirdparty source files -if (env["libvorbis"] != "system"): # builtin +if (env["libvorbis"] != "system"): # builtin thirdparty_dir = "#thirdparty/libvorbis/" thirdparty_sources = [ #"analysis.c", @@ -39,11 +39,11 @@ if (env["libvorbis"] != "system"): # builtin thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_vorbis.add_source_files(env.modules_sources, thirdparty_sources) - env_vorbis.Append(CPPPATH = [thirdparty_dir]) + env_vorbis.Append(CPPPATH=[thirdparty_dir]) # also requires libogg - if (env["libogg"] != "system"): # builtin - env_vorbis.Append(CPPPATH = ["#thirdparty/libogg"]) + if (env["libogg"] != "system"): # builtin + env_vorbis.Append(CPPPATH=["#thirdparty/libogg"]) # Godot source files env_vorbis.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/webm/SCsub b/modules/webm/SCsub index bb87e73980..c4a707b8e0 100644 --- a/modules/webm/SCsub +++ b/modules/webm/SCsub @@ -16,17 +16,17 @@ thirdparty_libsimplewebm_sources = [ thirdparty_libsimplewebm_sources = [thirdparty_libsimplewebm_dir + file for file in thirdparty_libsimplewebm_sources] env_webm.add_source_files(env.modules_sources, thirdparty_libsimplewebm_sources) -env_webm.Append(CPPPATH = [thirdparty_libsimplewebm_dir, thirdparty_libsimplewebm_dir + "libwebm/"]) +env_webm.Append(CPPPATH=[thirdparty_libsimplewebm_dir, thirdparty_libsimplewebm_dir + "libwebm/"]) # also requires libogg, libvorbis and libopus -if (env["libogg"] != "system"): # builtin - env_webm.Append(CPPPATH = ["#thirdparty/libogg"]) -if (env["libvorbis"] != "system"): # builtin - env_webm.Append(CPPPATH = ["#thirdparty/libvorbis"]) -if (env["opus"] != "system"): # builtin - env_webm.Append(CPPPATH = ["#thirdparty"]) +if (env["libogg"] != "system"): # builtin + env_webm.Append(CPPPATH=["#thirdparty/libogg"]) +if (env["libvorbis"] != "system"): # builtin + env_webm.Append(CPPPATH=["#thirdparty/libvorbis"]) +if (env["opus"] != "system"): # builtin + env_webm.Append(CPPPATH=["#thirdparty"]) -if (env["libvpx"] != "system"): # builtin +if (env["libvpx"] != "system"): # builtin Export('env_webm') SConscript("libvpx/SCsub") diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index 12e37886f4..a7eca29c05 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -248,10 +248,10 @@ libvpx_sources_arm_neon_gas_apple = [libvpx_dir + file for file in libvpx_source Import('env') Import('env_webm') -env_webm.Append(CPPPATH = [libvpx_dir]) +env_webm.Append(CPPPATH=[libvpx_dir]) env_libvpx = env.Clone() -env_libvpx.Append(CPPPATH = [libvpx_dir]) +env_libvpx.Append(CPPPATH=[libvpx_dir]) cpu_bits = env["bits"] osx_fat = (env["platform"] == 'osx' and cpu_bits == 'fat') diff --git a/modules/webm/libvpx/yasm_osx_fat.py b/modules/webm/libvpx/yasm_osx_fat.py index c39b95c780..0065e2766c 100644 --- a/modules/webm/libvpx/yasm_osx_fat.py +++ b/modules/webm/libvpx/yasm_osx_fat.py @@ -3,9 +3,9 @@ import sys import os -includes = sys.argv[1] +includes = sys.argv[1] output_file = sys.argv[2] -input_file = sys.argv[3] +input_file = sys.argv[3] can_remove = {} diff --git a/modules/webp/SCsub b/modules/webp/SCsub index 57dde509e3..ab60bfd6b2 100644 --- a/modules/webp/SCsub +++ b/modules/webp/SCsub @@ -6,7 +6,7 @@ Import('env_modules') env_webp = env_modules.Clone() # Thirdparty source files -if (env["libwebp"] != "system"): # builtin +if (env["libwebp"] != "system"): # builtin thirdparty_dir = "#thirdparty/libwebp/" thirdparty_sources = [ "enc/webpenc.c", @@ -115,7 +115,7 @@ if (env["libwebp"] != "system"): # builtin thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] env_webp.add_source_files(env.modules_sources, thirdparty_sources) - env_webp.Append(CPPPATH = [thirdparty_dir]) + env_webp.Append(CPPPATH=[thirdparty_dir]) # Godot source files env_webp.add_source_files(env.modules_sources, "*.cpp") |