style: Fix PEP8 whitespace issues in Python files

bin/tests/SCsub

@@ -2,13 +2,13 @@
 
 Import('env')
 
-env.tests_sources=[]
-env.add_source_files(env.tests_sources,"*.cpp")
+env.tests_sources = []
+env.add_source_files(env.tests_sources, "*.cpp")
 
 Export('env')
 
-#SConscript('math/SCsub');
+# SConscript('math/SCsub');
 
-lib = env.Library("tests",env.tests_sources)
+lib = env.Library("tests", env.tests_sources)
 
 env.Prepend(LIBS=[lib])

core/SCsub

@@ -2,66 +2,66 @@
 
 Import('env')
 
-env.core_sources=[]
+env.core_sources = []
 
 
-gd_call=""
-gd_inc=""
+gd_call = ""
+gd_inc = ""
 
 for x in env.global_defaults:
-    env.core_sources.append("#platform/"+x+"/globals/global_defaults.cpp")
-    gd_inc+='#include "platform/'+x+'/globals/global_defaults.h"\n'
-    gd_call+="\tregister_"+x+"_global_defaults();\n"
+    env.core_sources.append("#platform/" + x + "/globals/global_defaults.cpp")
+    gd_inc += '#include "platform/' + x + '/globals/global_defaults.h"\n'
+    gd_call += "\tregister_" + x + "_global_defaults();\n"
 
-gd_cpp='#include "globals.h"\n'
-gd_cpp+=gd_inc
-gd_cpp+="void Globals::register_global_defaults() {\n"+gd_call+"\n}\n"
+gd_cpp = '#include "globals.h"\n'
+gd_cpp += gd_inc
+gd_cpp += "void Globals::register_global_defaults() {\n" + gd_call + "\n}\n"
 
-f = open("global_defaults.cpp","wb")
+f = open("global_defaults.cpp", "wb")
 f.write(gd_cpp)
 f.close()
 
 import os
 txt = "0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0"
 if ("SCRIPT_AES256_ENCRYPTION_KEY" in os.environ):
-    e=os.environ["SCRIPT_AES256_ENCRYPTION_KEY"]
+    e = os.environ["SCRIPT_AES256_ENCRYPTION_KEY"]
     txt = ""
-    ec_valid=True
-    if (len(e)!=64):
-        ec_valid=False
+    ec_valid = True
+    if (len(e) != 64):
+        ec_valid = False
     else:
 
-        for i in range(len(e)>>1):
-            if (i>0):
-                txt+=","
-            txts="0x"+e[i*2:i*2+2]
+        for i in range(len(e) >> 1):
+            if (i > 0):
+                txt += ","
+            txts = "0x" + e[i * 2:i * 2 + 2]
             try:
-                int(txts,16)
+                int(txts, 16)
             except:
-                ec_valid=False
-            txt+=txts
+                ec_valid = False
+            txt += txts
     if (not ec_valid):
         txt = "0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0"
-        print("Invalid AES256 encryption key, not 64 bits hex: "+e)
+        print("Invalid AES256 encryption key, not 64 bits hex: " + e)
 
 f = open("script_encryption_key.cpp", "wb")
 f.write("#include \"globals.h\"\nuint8_t script_encryption_key[32]={" + txt + "};\n")
 f.close()
 
 
-env.add_source_files(env.core_sources,"*.cpp")
+env.add_source_files(env.core_sources, "*.cpp")
 
 
 Export('env')
 
 import make_binders
-env.Command(['method_bind.inc','method_bind_ext.inc'], 'make_binders.py', make_binders.run)
+env.Command(['method_bind.inc', 'method_bind_ext.inc'], 'make_binders.py', make_binders.run)
 
 SConscript('os/SCsub');
 SConscript('math/SCsub');
 SConscript('io/SCsub');
 SConscript('bind/SCsub');
 
-lib = env.Library("core",env.core_sources)
+lib = env.Library("core", env.core_sources)
 
 env.Prepend(LIBS=[lib])

core/bind/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.core_sources,"*.cpp")
+env.add_source_files(env.core_sources, "*.cpp")
 
 Export('env')

core/io/SCsub

@@ -2,8 +2,8 @@
 
 Import('env')
 
-env.add_source_files(env.core_sources,"*.cpp")
-env.add_source_files(env.core_sources,"*.c")
-#env.core_sources.append("io/fastlz.c")
+env.add_source_files(env.core_sources, "*.cpp")
+env.add_source_files(env.core_sources, "*.c")
+# env.core_sources.append("io/fastlz.c")
 
 Export('env')

core/make_binders.py

 # -*- coding: ibm850 -*-
 
 
-template_typed="""
+template_typed = """
 #ifdef TYPED_METHOD_BIND
 template<class T $ifret ,class R$ $ifargs ,$ $arg, class P@$>
 class MethodBind$argc$$ifret R$$ifconst C$ : public MethodBind {
@@ -77,7 +77,7 @@ MethodBind* create_method_bind($ifret R$ $ifnoret void$ (T::*p_method)($arg, P@$
 #endif
 """
 
-template="""
+template = """
 #ifndef TYPED_METHOD_BIND
 $iftempl template<$ $ifret class R$ $ifretargs ,$ $arg, class P@$ $iftempl >$
 class MethodBind$argc$$ifret R$$ifconst C$ : public MethodBind {
@@ -166,96 +166,96 @@ MethodBind* create_method_bind($ifret R$ $ifnoret void$ (T::*p_method)($arg, P@$
 """
 
 
-def make_version(template,nargs,argmax,const,ret):
+def make_version(template, nargs, argmax, const, ret):
 
-    intext=template
-    from_pos=0
-    outtext=""
+    intext = template
+    from_pos = 0
+    outtext = ""
 
     while(True):
-        to_pos=intext.find("$",from_pos)
-        if (to_pos==-1):
-            outtext+=intext[from_pos:]
+        to_pos = intext.find("$", from_pos)
+        if (to_pos == -1):
+            outtext += intext[from_pos:]
             break
         else:
-            outtext+=intext[from_pos:to_pos]
-        end=intext.find("$",to_pos+1)
-        if (end==-1):
-            break # ignore
-        macro=intext[to_pos+1:end]
-        cmd=""
-        data=""
-
-        if (macro.find(" ")!=-1):
-            cmd=macro[0:macro.find(" ")]
-            data=macro[macro.find(" ")+1:]
+            outtext += intext[from_pos:to_pos]
+        end = intext.find("$", to_pos + 1)
+        if (end == -1):
+            break  # ignore
+        macro = intext[to_pos + 1:end]
+        cmd = ""
+        data = ""
+
+        if (macro.find(" ") != -1):
+            cmd = macro[0:macro.find(" ")]
+            data = macro[macro.find(" ") + 1:]
         else:
-            cmd=macro
-
-        if (cmd=="argc"):
-            outtext+=str(nargs)
-        if (cmd=="ifret" and ret):
-            outtext+=data
-        if (cmd=="ifargs" and nargs):
-            outtext+=data
-        if (cmd=="ifretargs" and nargs and ret):
-            outtext+=data
-        if (cmd=="ifconst" and const):
-            outtext+=data
-        elif (cmd=="ifnoconst" and not const):
-            outtext+=data
-        elif (cmd=="ifnoret" and not ret):
-            outtext+=data
-        elif (cmd=="iftempl" and (nargs>0 or ret)):
-            outtext+=data
-        elif (cmd=="arg,"):
-            for i in range(1,nargs+1):
-                if (i>1):
-                    outtext+=", "
-                outtext+=data.replace("@",str(i))
-        elif (cmd=="arg"):
-            for i in range(1,nargs+1):
-                outtext+=data.replace("@",str(i))
-        elif (cmd=="noarg"):
-            for i in range(nargs+1,argmax+1):
-                outtext+=data.replace("@",str(i))
-        elif (cmd=="noarg"):
-            for i in range(nargs+1,argmax+1):
-                outtext+=data.replace("@",str(i))
-
-        from_pos=end+1
+            cmd = macro
+
+        if (cmd == "argc"):
+            outtext += str(nargs)
+        if (cmd == "ifret" and ret):
+            outtext += data
+        if (cmd == "ifargs" and nargs):
+            outtext += data
+        if (cmd == "ifretargs" and nargs and ret):
+            outtext += data
+        if (cmd == "ifconst" and const):
+            outtext += data
+        elif (cmd == "ifnoconst" and not const):
+            outtext += data
+        elif (cmd == "ifnoret" and not ret):
+            outtext += data
+        elif (cmd == "iftempl" and (nargs > 0 or ret)):
+            outtext += data
+        elif (cmd == "arg,"):
+            for i in range(1, nargs + 1):
+                if (i > 1):
+                    outtext += ", "
+                outtext += data.replace("@", str(i))
+        elif (cmd == "arg"):
+            for i in range(1, nargs + 1):
+                outtext += data.replace("@", str(i))
+        elif (cmd == "noarg"):
+            for i in range(nargs + 1, argmax + 1):
+                outtext += data.replace("@", str(i))
+        elif (cmd == "noarg"):
+            for i in range(nargs + 1, argmax + 1):
+                outtext += data.replace("@", str(i))
+
+        from_pos = end + 1
 
     return outtext
 
 
 def run(target, source, env):
 
-    versions=10
-    versions_ext=6
-    text=""
-    text_ext=""
-
-    for i in range(0,versions+1):
-
-        t=""
-        t+=make_version(template,i,versions,False,False)
-        t+=make_version(template_typed,i,versions,False,False)
-        t+=make_version(template,i,versions,False,True)
-        t+=make_version(template_typed,i,versions,False,True)
-        t+=make_version(template,i,versions,True,False)
-        t+=make_version(template_typed,i,versions,True,False)
-        t+=make_version(template,i,versions,True,True)
-        t+=make_version(template_typed,i,versions,True,True)
-        if (i>=versions_ext):
-            text_ext+=t
+    versions = 10
+    versions_ext = 6
+    text = ""
+    text_ext = ""
+
+    for i in range(0, versions + 1):
+
+        t = ""
+        t += make_version(template, i, versions, False, False)
+        t += make_version(template_typed, i, versions, False, False)
+        t += make_version(template, i, versions, False, True)
+        t += make_version(template_typed, i, versions, False, True)
+        t += make_version(template, i, versions, True, False)
+        t += make_version(template_typed, i, versions, True, False)
+        t += make_version(template, i, versions, True, True)
+        t += make_version(template_typed, i, versions, True, True)
+        if (i >= versions_ext):
+            text_ext += t
         else:
-            text+=t
+            text += t
 
 
-    f=open(target[0].path,"w")
+    f = open(target[0].path, "w")
     f.write(text)
     f.close()
 
-    f=open(target[1].path,"w")
+    f = open(target[1].path, "w")
     f.write(text_ext)
     f.close()

core/math/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.core_sources,"*.cpp")
+env.add_source_files(env.core_sources, "*.cpp")
 
 Export('env')

core/os/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.core_sources,"*.cpp")
+env.add_source_files(env.core_sources, "*.cpp")
 
 Export('env')

doc/tools/doc_status.py

@@ -11,7 +11,7 @@ import xml.etree.ElementTree as ET
 ################################################################################
 
 flags = {
-    'c': platform.platform() != 'Windows', # Disable by default on windows, since we use ANSI escape codes
+    'c': platform.platform() != 'Windows',  # Disable by default on windows, since we use ANSI escape codes
     'b': False,
     'g': False,
     's': False,
@@ -62,15 +62,15 @@ long_flags = {
 table_columns = ['name', 'brief_description', 'description', 'methods', 'constants', 'members', 'signals']
 table_column_names = ['Name', 'Brief Desc.', 'Desc.', 'Methods', 'Constants', 'Members', 'Signals']
 colors = {
-    'name': [36], # cyan
-    'part_big_problem': [4, 31], # underline, red
-    'part_problem': [31], # red
-    'part_mostly_good': [33], # yellow
-    'part_good': [32], # green
-    'url': [4, 34], # underline, blue
-    'section': [1, 4], # bold, underline
-    'state_off': [36], # cyan
-    'state_on': [1, 35], # bold, magenta/plum
+    'name': [36],  # cyan
+    'part_big_problem': [4, 31],  # underline, red
+    'part_problem': [31],  # red
+    'part_mostly_good': [33],  # yellow
+    'part_good': [32],  # green
+    'url': [4, 34],  # underline, blue
+    'section': [1, 4],  # bold, underline
+    'state_off': [36],  # cyan
+    'state_on': [1, 35],  # bold, magenta/plum
 }
 overall_progress_description_weigth = 10
 
@@ -105,7 +105,7 @@ def nonescape_len(s):
 ################################################################################
 
 class ClassStatusProgress:
-    def __init__(self, described = 0, total = 0):
+    def __init__(self, described=0, total=0):
         self.described = described
         self.total = total
 
@@ -127,12 +127,12 @@ class ClassStatusProgress:
             return self.to_colored_string()
 
     def to_colored_string(self, format='{has}/{total}', pad_format='{pad_described}{s}{pad_total}'):
-        ratio = self.described/self.total if self.total != 0 else 1
-        percent = round(100*ratio)
-        s = format.format(has = str(self.described), total = str(self.total), percent = str(percent))
+        ratio = self.described / self.total if self.total != 0 else 1
+        percent = round(100 * ratio)
+        s = format.format(has=str(self.described), total=str(self.total), percent=str(percent))
         if self.described >= self.total:
             s = color('part_good', s)
-        elif self.described >= self.total/4*3:
+        elif self.described >= self.total / 4 * 3:
             s = color('part_mostly_good', s)
         elif self.described > 0:
             s = color('part_problem', s)
@@ -142,7 +142,7 @@ class ClassStatusProgress:
         pad_described = ''.ljust(pad_size - len(str(self.described)))
         pad_percent = ''.ljust(3 - len(str(percent)))
         pad_total = ''.ljust(pad_size - len(str(self.total)))
-        return pad_format.format(pad_described = pad_described, pad_total = pad_total, pad_percent = pad_percent, s = s)
+        return pad_format.format(pad_described=pad_described, pad_total=pad_total, pad_percent=pad_percent, s=s)
 
 
 class ClassStatus:
@@ -231,7 +231,7 @@ class ClassStatus:
                     status.progresses[tag.tag].increment(len(sub_tag.text.strip()) > 0)
 
             elif tag.tag in ['theme_items']:
-                pass #Ignore those tags, since they seem to lack description at all
+                pass  # Ignore those tags, since they seem to lack description at all
 
             else:
                 print(tag.tag, tag.attrib)
@@ -296,10 +296,10 @@ if len(input_file_list) < 1 or flags['h']:
             if long_flags[synonym] == flag:
                 synonyms.append(color('name', '--' + synonym))
 
-        print(('{synonyms} (Currently '+color('state_'+('on' if flags[flag] else 'off'), '{value}')+')\n\t{description}').format(
-            synonyms = ', '.join(synonyms),
-            value = ('on' if flags[flag] else 'off'),
-            description = flag_descriptions[flag]
+        print(('{synonyms} (Currently ' + color('state_' + ('on' if flags[flag] else 'off'), '{value}') + ')\n\t{description}').format(
+            synonyms=', '.join(synonyms),
+            value=('on' if flags[flag] else 'off'),
+            description=flag_descriptions[flag]
         ))
     sys.exit(0)
 
@@ -413,9 +413,9 @@ for row_i, row in enumerate(table):
     for cell_i, cell in enumerate(row):
         padding_needed = table_column_sizes[cell_i] - nonescape_len(cell) + 2
         if cell_i == 0:
-            row_string += table_row_chars[2] + cell + table_row_chars[2]*(padding_needed-1)
+            row_string += table_row_chars[2] + cell + table_row_chars[2] * (padding_needed - 1)
         else:
-            row_string += table_row_chars[2]*math.floor(padding_needed/2) + cell + table_row_chars[2]*math.ceil((padding_needed/2))
+            row_string += table_row_chars[2] * math.floor(padding_needed / 2) + cell + table_row_chars[2] * math.ceil((padding_needed / 2))
         row_string += table_column_chars
 
     print(row_string)

doc/tools/makemd.py

@@ -82,7 +82,7 @@ def make_class_list(class_list, columns):
             else:
                 s += ' | '
 
-            s += '[' + classname + '](class_'+ classname.lower()+') | '
+            s += '[' + classname + '](class_' + classname.lower() + ') | '
 
         s += '\n'
         f.write(s)
@@ -126,14 +126,14 @@ def dokuize_text(text):
 
                 if param.find('.') != -1:
                     (class_param, method_param) = param.split('.')
-                    tag_text = '['+class_param+'.'+method_param.replace("_","_")+'](' + class_param.lower() + '#' \
+                    tag_text = '[' + class_param + '.' + method_param.replace("_", "_") + '](' + class_param.lower() + '#' \
                         + method_param + ')'
                 else:
-                    tag_text = '[' + param.replace("_","_") + '](#' + param + ')'
+                    tag_text = '[' + param.replace("_", "_") + '](#' + param + ')'
             elif cmd.find('image=') == 0:
                 tag_text = '![](' + cmd[6:] + ')'
             elif cmd.find('url=') == 0:
-                tag_text = '[' + cmd[4:] + ']('+cmd[4:]
+                tag_text = '[' + cmd[4:] + '](' + cmd[4:]
             elif cmd == '/url':
                 tag_text = ')'
             elif cmd == 'center':
@@ -205,9 +205,9 @@ def make_method(
         # a.attrib["name"]=name+"_"+m.attrib["name"]
         # a.text=name+"::"+m.attrib["name"]
 
-        s += ' **'+m.attrib['name'].replace("_","_")+'** '
+        s += ' **' + m.attrib['name'].replace("_", "_") + '** '
     else:
-        s += ' **['+ m.attrib['name'].replace("_","_")+'](#' + m.attrib['name'] + ')** '
+        s += ' **[' + m.attrib['name'].replace("_", "_") + '](#' + m.attrib['name'] + ')** '
 
     s += ' **(**'
     argfound = False
@@ -245,13 +245,13 @@ def make_doku_class(node):
 
     name = node.attrib['name']
 
-    f = open("class_"+name.lower() + '.md', 'wb')
+    f = open("class_" + name.lower() + '.md', 'wb')
 
     f.write('#  ' + name + '  \n')
 
     if 'inherits' in node.attrib:
         inh = node.attrib['inherits'].strip()
-        f.write('####**Inherits:** '+make_type(inh)+'\n')
+        f.write('####**Inherits:** ' + make_type(inh) + '\n')
     if 'category' in node.attrib:
         f.write('####**Category:** ' + node.attrib['category'].strip()
                 + '\n')
@@ -313,7 +313,7 @@ def make_doku_class(node):
             d = m.find('description')
             if d == None or d.text.strip() == '':
                 continue
-            f.write('\n#### <a name="'+m.attrib['name']+'">' + m.attrib['name'] + '</a>\n')
+            f.write('\n#### <a name="' + m.attrib['name'] + '">' + m.attrib['name'] + '</a>\n')
             make_method(f, node.attrib['name'], m, True)
             f.write('\n')
             f.write(dokuize_text(d.text.strip()))

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])

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")

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")

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")

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()
 

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])

main/SCsub

@@ -2,11 +2,11 @@
 
 Import('env')
 
-env.main_sources=[]
-env.add_source_files(env.main_sources,"*.cpp")
+env.main_sources = []
+env.add_source_files(env.main_sources, "*.cpp")
 
 Export('env')
 
-lib = env.Library("main",env.main_sources)
+lib = env.Library("main", env.main_sources)
 
 env.Prepend(LIBS=[lib])

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])

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")

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")

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')

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")

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")

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")

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')

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")

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")

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")

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")

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")

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")
 

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')

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 = {}
 

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")

platform/android/SCsub

@@ -22,7 +22,7 @@ android_files = [
     'java_class_wrapper.cpp'
 ]
 
-#env.Depends('#core/math/vector3.h', 'vector3_psp.h')
+# env.Depends('#core/math/vector3.h', 'vector3_psp.h')
 
 #obj = env.SharedObject('godot_android.cpp')
 
@@ -30,86 +30,86 @@ env_android = env.Clone()
 if env['target'] == "profile":
     env_android.Append(CPPFLAGS=['-DPROFILER_ENABLED'])
 
-android_objects=[]
+android_objects = []
 for x in android_files:
-    android_objects.append( env_android.SharedObject( x ) )
+    android_objects.append(env_android.SharedObject(x))
 
 prog = None
 
-abspath=env.Dir(".").abspath
+abspath = env.Dir(".").abspath
 
 
-gradle_basein = open(abspath+"/build.gradle.template","rb")
-gradle_baseout = open(abspath+"/java/build.gradle","wb")
+gradle_basein = open(abspath + "/build.gradle.template", "rb")
+gradle_baseout = open(abspath + "/java/build.gradle", "wb")
 
 gradle_text = gradle_basein.read()
 
 
-gradle_maven_repos_text=""
+gradle_maven_repos_text = ""
 
 if len(env.android_maven_repos) > 0:
-    gradle_maven_repos_text+="maven {\n"
+    gradle_maven_repos_text += "maven {\n"
     for x in env.android_maven_repos:
-        gradle_maven_repos_text+="\t\t"+x+"\n"
-    gradle_maven_repos_text+="\t}\n"
+        gradle_maven_repos_text += "\t\t" + x + "\n"
+    gradle_maven_repos_text += "\t}\n"
 
-gradle_maven_dependencies_text=""
+gradle_maven_dependencies_text = ""
 
 for x in env.android_dependencies:
-    gradle_maven_dependencies_text+=x+"\n"
+    gradle_maven_dependencies_text += x + "\n"
 
-gradle_java_dirs_text=""
+gradle_java_dirs_text = ""
 
 for x in env.android_java_dirs:
-    gradle_java_dirs_text+=",'"+x.replace("\\","/")+"'"
+    gradle_java_dirs_text += ",'" + x.replace("\\", "/") + "'"
 
 
-gradle_res_dirs_text=""
+gradle_res_dirs_text = ""
 
 for x in env.android_res_dirs:
-    gradle_res_dirs_text+=",'"+x.replace("\\","/")+"'"
+    gradle_res_dirs_text += ",'" + x.replace("\\", "/") + "'"
 
-gradle_aidl_dirs_text=""
+gradle_aidl_dirs_text = ""
 
 for x in env.android_aidl_dirs:
-    gradle_aidl_dirs_text+=",'"+x.replace("\\","/")+"'"
+    gradle_aidl_dirs_text += ",'" + x.replace("\\", "/") + "'"
 
-gradle_jni_dirs_text=""
+gradle_jni_dirs_text = ""
 
 for x in env.android_jni_dirs:
-    gradle_jni_dirs_text+=",'"+x.replace("\\","/")+"'"
+    gradle_jni_dirs_text += ",'" + x.replace("\\", "/") + "'"
 
-gradle_asset_dirs_text=""
+gradle_asset_dirs_text = ""
 
-gradle_default_config_text=""
+gradle_default_config_text = ""
 
 for x in env.android_default_config:
-    gradle_default_config_text+=x+"\n\t\t"
+    gradle_default_config_text += x + "\n\t\t"
 
-gradle_text = gradle_text.replace("$$GRADLE_REPOSITORY_URLS$$",gradle_maven_repos_text)
-gradle_text = gradle_text.replace("$$GRADLE_DEPENDENCIES$$",gradle_maven_dependencies_text)
-gradle_text = gradle_text.replace("$$GRADLE_JAVA_DIRS$$",gradle_java_dirs_text)
-gradle_text = gradle_text.replace("$$GRADLE_RES_DIRS$$",gradle_res_dirs_text)
-gradle_text = gradle_text.replace("$$GRADLE_ASSET_DIRS$$",gradle_asset_dirs_text)
-gradle_text = gradle_text.replace("$$GRADLE_AIDL_DIRS$$",gradle_aidl_dirs_text)
-gradle_text = gradle_text.replace("$$GRADLE_JNI_DIRS$$",gradle_jni_dirs_text)
-gradle_text = gradle_text.replace("$$GRADLE_DEFAULT_CONFIG$$",gradle_default_config_text)
+gradle_text = gradle_text.replace("$$GRADLE_REPOSITORY_URLS$$", gradle_maven_repos_text)
+gradle_text = gradle_text.replace("$$GRADLE_DEPENDENCIES$$", gradle_maven_dependencies_text)
+gradle_text = gradle_text.replace("$$GRADLE_JAVA_DIRS$$", gradle_java_dirs_text)
+gradle_text = gradle_text.replace("$$GRADLE_RES_DIRS$$", gradle_res_dirs_text)
+gradle_text = gradle_text.replace("$$GRADLE_ASSET_DIRS$$", gradle_asset_dirs_text)
+gradle_text = gradle_text.replace("$$GRADLE_AIDL_DIRS$$", gradle_aidl_dirs_text)
+gradle_text = gradle_text.replace("$$GRADLE_JNI_DIRS$$", gradle_jni_dirs_text)
+gradle_text = gradle_text.replace("$$GRADLE_DEFAULT_CONFIG$$", gradle_default_config_text)
 
 
-gradle_baseout.write( gradle_text )
+gradle_baseout.write(gradle_text)
 gradle_baseout.close()
 
 
-pp_basein = open(abspath+"/AndroidManifest.xml.template","rb")
-pp_baseout = open(abspath+"/java/AndroidManifest.xml","wb")
+pp_basein = open(abspath + "/AndroidManifest.xml.template", "rb")
+pp_baseout = open(abspath + "/java/AndroidManifest.xml", "wb")
 manifest = pp_basein.read()
-manifest = manifest.replace("$$ADD_APPLICATION_CHUNKS$$",env.android_manifest_chunk)
-manifest = manifest.replace("$$ADD_PERMISSION_CHUNKS$$",env.android_permission_chunk)
-manifest = manifest.replace("$$ADD_APPATTRIBUTE_CHUNKS$$",env.android_appattributes_chunk)
-pp_baseout.write( manifest )
+manifest = manifest.replace("$$ADD_APPLICATION_CHUNKS$$", env.android_manifest_chunk)
+manifest = manifest.replace("$$ADD_PERMISSION_CHUNKS$$", env.android_permission_chunk)
+manifest = manifest.replace("$$ADD_APPATTRIBUTE_CHUNKS$$", env.android_appattributes_chunk)
+pp_baseout.write(manifest)
 
 
-env_android.SharedLibrary("#bin/libgodot",[android_objects],SHLIBSUFFIX=env["SHLIBSUFFIX"])
+env_android.SharedLibrary("#bin/libgodot", [android_objects], SHLIBSUFFIX=env["SHLIBSUFFIX"])
 
 
 lib_arch_dir = ''
@@ -125,8 +125,8 @@ else:
 if lib_arch_dir != '':
     if env['target'] == 'release':
         lib_type_dir = 'release'
-    else: # release_debug, debug
+    else:  # release_debug, debug
         lib_type_dir = 'debug'
 
-    out_dir = '#platform/android/java/libs/'+lib_type_dir+'/'+lib_arch_dir
-    env_android.Command(out_dir+'/libgodot_android.so', '#bin/libgodot'+env['SHLIBSUFFIX'], Move("$TARGET", "$SOURCE"))
+    out_dir = '#platform/android/java/libs/' + lib_type_dir + '/' + lib_arch_dir
+    env_android.Command(out_dir + '/libgodot_android.so', '#bin/libgodot' + env['SHLIBSUFFIX'], Move("$TARGET", "$SOURCE"))

platform/bb10/detect.py

@@ -53,7 +53,7 @@ def configure(env):
     env['OBJSUFFIX'] = ".qnx.${qnx_target}.o"
     env['LIBSUFFIX'] = ".qnx.${qnx_target}.a"
     env['PROGSUFFIX'] = ".qnx.${qnx_target}"
-    print("PROGSUFFIX: "+env['PROGSUFFIX']+" target: "+env['qnx_target'])
+    print("PROGSUFFIX: " + env['PROGSUFFIX'] + " target: " + env['qnx_target'])
 
     env.PrependENVPath('PATH', env['QNX_CONFIGURATION'] + '/bin')
     env.PrependENVPath('PATH', env['QNX_CONFIGURATION'] + '/usr/bin')
@@ -66,23 +66,23 @@ def configure(env):
     env['AR'] = '$qnx_prefix-ar'
     env['RANLIB'] = '$qnx_prefix-ranlib'
 
-    env.Append(CPPPATH = ['#platform/bb10'])
-    env.Append(LIBPATH = ['#platform/bb10/lib/$qnx_target', '#platform/bb10/lib/$qnx_target_ver'])
-    env.Append(CCFLAGS = string.split('-DBB10_ENABLED -DUNIX_ENABLED -DGLES2_ENABLED -DGLES1_ENABLED -D_LITTLE_ENDIAN -DNO_THREADS -DNO_FCNTL'))
-    if env['bb10_exceptions']=="yes":
-        env.Append(CCFLAGS = ['-fexceptions'])
+    env.Append(CPPPATH=['#platform/bb10'])
+    env.Append(LIBPATH=['#platform/bb10/lib/$qnx_target', '#platform/bb10/lib/$qnx_target_ver'])
+    env.Append(CCFLAGS=string.split('-DBB10_ENABLED -DUNIX_ENABLED -DGLES2_ENABLED -DGLES1_ENABLED -D_LITTLE_ENDIAN -DNO_THREADS -DNO_FCNTL'))
+    if env['bb10_exceptions'] == "yes":
+        env.Append(CCFLAGS=['-fexceptions'])
     else:
-        env.Append(CCFLAGS = ['-fno-exceptions'])
+        env.Append(CCFLAGS=['-fno-exceptions'])
 
-    #env.Append(LINKFLAGS = string.split()
+    # env.Append(LINKFLAGS = string.split()
 
-    if (env["target"]=="release"):
+    if (env["target"] == "release"):
 
-        env.Append(CCFLAGS=['-O3','-DRELEASE_BUILD'])
+        env.Append(CCFLAGS=['-O3', '-DRELEASE_BUILD'])
 
-    elif (env["target"]=="debug"):
+    elif (env["target"] == "debug"):
 
-        env.Append(CCFLAGS=['-g', '-O0','-DDEBUG_ENABLED', '-D_DEBUG'])
+        env.Append(CCFLAGS=['-g', '-O0', '-DDEBUG_ENABLED', '-D_DEBUG'])
         env.Append(LINKFLAGS=['-g'])
 
     env.Append(LIBS=['bps', 'pps', 'screen', 'socket', 'EGL', 'GLESv2', 'GLESv1_CM', 'm', 'asound'])

platform/haiku/SCsub

@@ -20,7 +20,7 @@ target = env.Program(
 command = env.Command('#bin/godot.rsrc', '#platform/haiku/godot.rdef',
                       ['rc -o $TARGET $SOURCE'])
 
-def addResourcesAction(target = None, source = None, env = None):
+def addResourcesAction(target=None, source=None, env=None):
     return env.Execute('xres -o ' + File(target)[0].path + ' bin/godot.rsrc')
 
 env.AddPostAction(target, addResourcesAction)

platform/haiku/detect.py

@@ -18,7 +18,7 @@ def can_build():
 
 def get_opts():
     return [
-        ('debug_release', 'Add debug symbols to release version','no')
+        ('debug_release', 'Add debug symbols to release version', 'no')
     ]
 
 def get_flags():
@@ -28,34 +28,34 @@ def get_flags():
 def configure(env):
     is64 = sys.maxsize > 2**32
 
-    if (env["bits"]=="default"):
+    if (env["bits"] == "default"):
         if (is64):
-            env["bits"]="64"
+            env["bits"] = "64"
         else:
-            env["bits"]="32"
+            env["bits"] = "32"
 
-    env.Append(CPPPATH = ['#platform/haiku'])
+    env.Append(CPPPATH=['#platform/haiku'])
 
     env["CC"] = "gcc-x86"
     env["CXX"] = "g++-x86"
 
-    if (env["target"]=="release"):
-        if (env["debug_release"]=="yes"):
+    if (env["target"] == "release"):
+        if (env["debug_release"] == "yes"):
             env.Append(CCFLAGS=['-g2'])
         else:
-            env.Append(CCFLAGS=['-O3','-ffast-math'])
-    elif (env["target"]=="release_debug"):
-        env.Append(CCFLAGS=['-O2','-ffast-math','-DDEBUG_ENABLED'])
-    elif (env["target"]=="debug"):
-        env.Append(CCFLAGS=['-g2', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
-
-    #env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
-    env.Append(CPPFLAGS = ['-DPTHREAD_NO_RENAME']) # TODO: enable when we have pthread_setname_np
-    env.Append(CPPFLAGS = ['-DOPENGL_ENABLED', '-DMEDIA_KIT_ENABLED'])
-    env.Append(CPPFLAGS = ['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL'])
-    env.Append(LIBS = ['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL'])
+            env.Append(CCFLAGS=['-O3', '-ffast-math'])
+    elif (env["target"] == "release_debug"):
+        env.Append(CCFLAGS=['-O2', '-ffast-math', '-DDEBUG_ENABLED'])
+    elif (env["target"] == "debug"):
+        env.Append(CCFLAGS=['-g2', '-Wall', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
+
+    # env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
+    env.Append(CPPFLAGS=['-DPTHREAD_NO_RENAME'])  # TODO: enable when we have pthread_setname_np
+    env.Append(CPPFLAGS=['-DOPENGL_ENABLED', '-DMEDIA_KIT_ENABLED'])
+    env.Append(CPPFLAGS=['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL'])
+    env.Append(LIBS=['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL'])
 
     import methods
-    env.Append(BUILDERS = {'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
-    env.Append(BUILDERS = {'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
-    env.Append(BUILDERS = {'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl')})
+    env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')})

platform/iphone/SCsub

@@ -19,7 +19,7 @@ iphone_lib = [
     'ios.mm',
 ]
 
-#env.Depends('#core/math/vector3.h', 'vector3_psp.h')
+# env.Depends('#core/math/vector3.h', 'vector3_psp.h')
 
 #iphone_lib = env.Library('iphone', iphone_lib)
 
@@ -30,7 +30,7 @@ if env['ios_gles22_override'] == "yes":
     env_ios.Append(CPPFLAGS=['-DGLES2_OVERRIDE'])
 
 
-#if env['ios_appirater'] == "yes":
+# if env['ios_appirater'] == "yes":
 #	env_ios.Append(CPPFLAGS=['-DAPPIRATER_ENABLED'])
 
 
@@ -38,5 +38,5 @@ obj = env_ios.Object('godot_iphone.cpp')
 
 prog = None
 prog = env_ios.Program('#bin/godot', [obj] + iphone_lib)
-action = "$IPHONEPATH/usr/bin/dsymutil "+File(prog)[0].path+" -o " + File(prog)[0].path + ".dSYM"
+action = "$IPHONEPATH/usr/bin/dsymutil " + File(prog)[0].path + " -o " + File(prog)[0].path + ".dSYM"
 env.AddPostAction(prog, action)

platform/iphone/detect.py

@@ -39,7 +39,7 @@ def get_flags():
         ('tools', 'no'),
         ('webp', 'yes'),
         ('builtin_zlib', 'yes'),
-        ('openssl','builtin'), #use builtin openssl
+        ('openssl', 'builtin'),  # use builtin openssl
     ]
 
 
@@ -48,7 +48,7 @@ def configure(env):
 
     env.Append(CPPPATH=['#platform/iphone'])
 
-    env['ENV']['PATH'] = env['IPHONEPATH']+"/Developer/usr/bin/:"+env['ENV']['PATH']
+    env['ENV']['PATH'] = env['IPHONEPATH'] + "/Developer/usr/bin/:" + env['ENV']['PATH']
 
     env['CC'] = '$IPHONEPATH/usr/bin/${ios_triple}clang'
     env['CXX'] = '$IPHONEPATH/usr/bin/${ios_triple}clang++'
@@ -56,21 +56,21 @@ def configure(env):
     env['RANLIB'] = '$IPHONEPATH/usr/bin/${ios_triple}ranlib'
 
     import string
-    if (env["ios_sim"]=="yes" or env["arch"] == "x86"): # i386, simulator
-        env["arch"]="x86"
-        env["bits"]="32"
+    if (env["ios_sim"] == "yes" or env["arch"] == "x86"):  # i386, simulator
+        env["arch"] = "x86"
+        env["bits"] = "32"
         env['CCFLAGS'] = string.split('-arch i386 -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fasm-blocks  -Wall -D__IPHONE_OS_VERSION_MIN_REQUIRED=40100 -isysroot $IPHONESDK -mios-simulator-version-min=4.3 -DCUSTOM_MATRIX_TRANSFORM_H=\\\"build/iphone/matrix4_iphone.h\\\" -DCUSTOM_VECTOR3_TRANSFORM_H=\\\"build/iphone/vector3_iphone.h\\\"')
-    elif (env["arch"]=="arm64"): # arm64
+    elif (env["arch"] == "arm64"):  # arm64
         env["bits"] = "64"
         env['CCFLAGS'] = string.split('-fno-objc-arc -arch arm64 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -Wno-trigraphs -fpascal-strings -Wmissing-prototypes -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -fvisibility=hidden -Wno-sign-conversion -MMD -MT dependencies -miphoneos-version-min=5.1.1 -isysroot $IPHONESDK')
         env.Append(CPPFLAGS=['-DNEED_LONG_INT'])
         env.Append(CPPFLAGS=['-DLIBYUV_DISABLE_NEON'])
-    else: # armv7
+    else:  # armv7
         env["arch"] = "arm"
         env["bits"] = "32"
         env['CCFLAGS'] = string.split('-fno-objc-arc -arch armv7 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -Wno-trigraphs -fpascal-strings -Wmissing-prototypes -Wreturn-type -Wparentheses -Wswitch -Wno-unused-parameter -Wunused-variable -Wunused-value -Wno-shorten-64-to-32 -isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS5.0.sdk -fvisibility=hidden -Wno-sign-conversion -mthumb "-DIBOutlet=__attribute__((iboutlet))" "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))" "-DIBAction=void)__attribute__((ibaction)" -miphoneos-version-min=5.1.1 -MMD -MT dependencies -isysroot $IPHONESDK')
 
-    if (env["arch"]=="x86"):
+    if (env["arch"] == "x86"):
         env['IPHONEPLATFORM'] = 'iPhoneSimulator'
         env.Append(LINKFLAGS=['-arch', 'i386', '-mios-simulator-version-min=4.3',
                               '-isysroot', '$IPHONESDK',
@@ -92,7 +92,7 @@ def configure(env):
                               '-framework', 'SystemConfiguration',
                               '-F$IPHONESDK',
                               ])
-    elif (env["arch"]=="arm64"):
+    elif (env["arch"] == "arm64"):
         env.Append(LINKFLAGS=['-arch', 'arm64', '-Wl,-dead_strip', '-miphoneos-version-min=5.1.1',
                                                 '-isysroot', '$IPHONESDK',
                                                 #'-stdlib=libc++',
@@ -139,39 +139,39 @@ def configure(env):
     if env['icloud'] == 'yes':
         env.Append(CPPFLAGS=['-DICLOUD_ENABLED'])
 
-    env.Append(CPPPATH = ['$IPHONESDK/usr/include', '$IPHONESDK/System/Library/Frameworks/OpenGLES.framework/Headers', '$IPHONESDK/System/Library/Frameworks/AudioUnit.framework/Headers'])
+    env.Append(CPPPATH=['$IPHONESDK/usr/include', '$IPHONESDK/System/Library/Frameworks/OpenGLES.framework/Headers', '$IPHONESDK/System/Library/Frameworks/AudioUnit.framework/Headers'])
 
-    if (env["target"]=="release"):
+    if (env["target"] == "release"):
 
-        env.Append(CCFLAGS=['-O3', '-DNS_BLOCK_ASSERTIONS=1','-Wall', '-gdwarf-2']) # removed -ffast-math
-        env.Append(LINKFLAGS=['-O3']) #
+        env.Append(CCFLAGS=['-O3', '-DNS_BLOCK_ASSERTIONS=1', '-Wall', '-gdwarf-2'])  # removed -ffast-math
+        env.Append(LINKFLAGS=['-O3'])
 
     elif env["target"] == "release_debug":
-        env.Append(CCFLAGS=['-Os', '-DNS_BLOCK_ASSERTIONS=1','-Wall','-DDEBUG_ENABLED'])
+        env.Append(CCFLAGS=['-Os', '-DNS_BLOCK_ASSERTIONS=1', '-Wall', '-DDEBUG_ENABLED'])
         env.Append(LINKFLAGS=['-Os'])
         env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ENABLED'])
 
-    elif (env["target"]=="debug"):
+    elif (env["target"] == "debug"):
 
         env.Append(CCFLAGS=['-D_DEBUG', '-DDEBUG=1', '-gdwarf-2', '-Wall', '-O0', '-DDEBUG_ENABLED'])
         env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ENABLED'])
 
-    elif (env["target"]=="profile"):
+    elif (env["target"] == "profile"):
 
-        env.Append(CCFLAGS=['-g','-pg', '-Os'])
+        env.Append(CCFLAGS=['-g', '-pg', '-Os'])
         env.Append(LINKFLAGS=['-pg'])
 
-    if (env["ios_sim"]=="yes"): #TODO: Check if needed?
+    if (env["ios_sim"] == "yes"):  # TODO: Check if needed?
         env['ENV']['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
     env['ENV']['CODESIGN_ALLOCATE'] = '/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate'
     env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DMPC_FIXED_POINT'])
 
     # TODO: Move that to opus module's config
     if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
-        env.opus_fixed_point="yes"
-        if env["arch"]=="x86":
+        env.opus_fixed_point = "yes"
+        if env["arch"] == "x86":
             pass
-        elif(env["arch"]=="arm64"):
+        elif(env["arch"] == "arm64"):
             env.Append(CFLAGS=["-DOPUS_ARM64_OPT"])
         else:
             env.Append(CFLAGS=["-DOPUS_ARM_OPT"])
@@ -180,10 +180,10 @@ def configure(env):
         env.Append(CPPFLAGS=['-fexceptions'])
     else:
         env.Append(CPPFLAGS=['-fno-exceptions'])
-    #env['neon_enabled']=True
+    # env['neon_enabled']=True
     env['S_compiler'] = '$IPHONEPATH/Developer/usr/bin/gcc'
 
     import methods
-    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')})

platform/javascript/SCsub

@@ -14,24 +14,24 @@ env_javascript = env.Clone()
 if env['target'] == "profile":
     env_javascript.Append(CPPFLAGS=['-DPROFILER_ENABLED'])
 
-javascript_objects=[]
+javascript_objects = []
 for x in javascript_files:
-    javascript_objects.append( env_javascript.Object( x ) )
+    javascript_objects.append(env_javascript.Object(x))
 
-env.Append(LINKFLAGS=["-s","EXPORTED_FUNCTIONS=\"['_main','_audio_server_mix_function','_main_after_fs_sync']\""])
-env.Append(LINKFLAGS=["--shell-file",'"platform/javascript/godot_shell.html"'])
+env.Append(LINKFLAGS=["-s", "EXPORTED_FUNCTIONS=\"['_main','_audio_server_mix_function','_main_after_fs_sync']\""])
+env.Append(LINKFLAGS=["--shell-file", '"platform/javascript/godot_shell.html"'])
 
-build = env.Program('#bin/godot',javascript_objects,PROGSUFFIX=env["PROGSUFFIX"]+".html")
+build = env.Program('#bin/godot', javascript_objects, PROGSUFFIX=env["PROGSUFFIX"] + ".html")
 
 def make_html_shell(target, source, env):
-	html_path = target[0].rstr()
-	assert html_path[:4] == 'bin/'
-	assert html_path[-5:] == '.html'
-	basename = html_path[4:-5]
-	with open(html_path, 'r+') as html_file:
-		fixed_html = html_file.read().replace('.html.mem', '.mem').replace(basename, '$GODOT_BASE')
-		html_file.seek(0)
-		html_file.truncate()
-		html_file.write(fixed_html)
+    html_path = target[0].rstr()
+    assert html_path[:4] == 'bin/'
+    assert html_path[-5:] == '.html'
+    basename = html_path[4:-5]
+    with open(html_path, 'r+') as html_file:
+        fixed_html = html_file.read().replace('.html.mem', '.mem').replace(basename, '$GODOT_BASE')
+        html_file.seek(0)
+        html_file.truncate()
+        html_file.write(fixed_html)
 
 env.AddPostAction(build, Action(make_html_shell, "Creating HTML shell file"))

platform/javascript/detect.py

@@ -18,8 +18,8 @@ def can_build():
 def get_opts():
 
     return [
-        ['wasm','Compile to WebAssembly','no'],
-        ['javascript_eval','Enable JavaScript eval interface','yes'],
+        ['wasm', 'Compile to WebAssembly', 'no'],
+        ['javascript_eval', 'Enable JavaScript eval interface', 'yes'],
     ]
 
 def get_flags():
@@ -40,13 +40,13 @@ def configure(env):
 
     env.Append(CPPPATH=['#platform/javascript'])
 
-    em_path=os.environ["EMSCRIPTEN_ROOT"]
+    em_path = os.environ["EMSCRIPTEN_ROOT"]
 
-    env['ENV']['PATH'] = em_path+":"+env['ENV']['PATH']
-    env['CC'] = em_path+'/emcc'
-    env['CXX'] = em_path+'/emcc'
+    env['ENV']['PATH'] = em_path + ":" + env['ENV']['PATH']
+    env['CC'] = em_path + '/emcc'
+    env['CXX'] = em_path + '/emcc'
     #env['AR'] = em_path+"/emar"
-    env['AR'] = em_path+"/emcc"
+    env['AR'] = em_path + "/emcc"
     env['ARFLAGS'] = "-o"
 
 #	env['RANLIB'] = em_path+"/emranlib"
@@ -60,11 +60,11 @@ def configure(env):
 
 #	env["LINKFLAGS"]= string.split(" -g --sysroot="+ld_sysroot+" -Wl,--no-undefined -Wl,-z,noexecstack ")
 
-    if (env["target"]=="release"):
+    if (env["target"] == "release"):
         env.Append(CCFLAGS=['-O2'])
-    elif (env["target"]=="release_debug"):
-        env.Append(CCFLAGS=['-O2','-DDEBUG_ENABLED'])
-    elif (env["target"]=="debug"):
+    elif (env["target"] == "release_debug"):
+        env.Append(CCFLAGS=['-O2', '-DDEBUG_ENABLED'])
+    elif (env["target"] == "debug"):
         env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-O2', '-DDEBUG_ENABLED'])
         #env.Append(CCFLAGS=['-D_DEBUG', '-Wall', '-g4', '-DDEBUG_ENABLED'])
         env.Append(CPPFLAGS=['-DDEBUG_MEMORY_ALLOC'])
@@ -73,33 +73,33 @@ def configure(env):
     if("module_opus_enabled" in env and env["module_opus_enabled"] != "no"):
         env.opus_fixed_point = "yes"
 
-    env.Append(CPPFLAGS=["-fno-exceptions",'-DNO_SAFE_CAST','-fno-rtti'])
-    env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DPTHREAD_NO_RENAME', '-DNO_FCNTL','-DMPC_FIXED_POINT','-DTYPED_METHOD_BIND','-DNO_THREADS'])
+    env.Append(CPPFLAGS=["-fno-exceptions", '-DNO_SAFE_CAST', '-fno-rtti'])
+    env.Append(CPPFLAGS=['-DJAVASCRIPT_ENABLED', '-DUNIX_ENABLED', '-DPTHREAD_NO_RENAME', '-DNO_FCNTL', '-DMPC_FIXED_POINT', '-DTYPED_METHOD_BIND', '-DNO_THREADS'])
     env.Append(CPPFLAGS=['-DGLES2_ENABLED'])
     env.Append(CPPFLAGS=['-DGLES_NO_CLIENT_ARRAYS'])
-    env.Append(CPPFLAGS=['-s','FULL_ES2=1'])
+    env.Append(CPPFLAGS=['-s', 'FULL_ES2=1'])
 #	env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED','-DMPC_FIXED_POINT'])
 
     if env['wasm'] == 'yes':
-        env.Append(LINKFLAGS=['-s','BINARYEN=1'])
-        env.Append(LINKFLAGS=['-s','\'BINARYEN_METHOD="native-wasm"\''])
-        env["PROGSUFFIX"]+=".webassembly"
+        env.Append(LINKFLAGS=['-s', 'BINARYEN=1'])
+        env.Append(LINKFLAGS=['-s', '\'BINARYEN_METHOD="native-wasm"\''])
+        env["PROGSUFFIX"] += ".webassembly"
     else:
-        env.Append(CPPFLAGS=['-s','ASM_JS=1'])
-        env.Append(LINKFLAGS=['-s','ASM_JS=1'])
+        env.Append(CPPFLAGS=['-s', 'ASM_JS=1'])
+        env.Append(LINKFLAGS=['-s', 'ASM_JS=1'])
 
     if env['javascript_eval'] == 'yes':
         env.Append(CPPFLAGS=['-DJAVASCRIPT_EVAL_ENABLED'])
 
     env.Append(LINKFLAGS=['-O2'])
-    #env.Append(LINKFLAGS=['-g4'])
+    # env.Append(LINKFLAGS=['-g4'])
 
-    #print "CCCOM is:", env.subst('$CCCOM')
-    #print "P: ", env['p'], " Platofrm: ", env['platform']
+    # print "CCCOM is:", env.subst('$CCCOM')
+    # print "P: ", env['p'], " Platofrm: ", env['platform']
 
     import methods
 
-    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')})
     #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )

platform/osx/SCsub

@@ -12,4 +12,4 @@ files = [
     'joystick_osx.cpp',
 ]
 
-env.Program('#bin/godot',files)
+env.Program('#bin/godot', files)

platform/osx/detect.py

@@ -20,8 +20,8 @@ def can_build():
 def get_opts():
 
     return [
-        ('force_64_bits','Force 64 bits binary','no'),
-        ('osxcross_sdk','OSXCross SDK version','darwin14'),
+        ('force_64_bits', 'Force 64 bits binary', 'no'),
+        ('osxcross_sdk', 'OSXCross SDK version', 'darwin14'),
 
     ]
 
@@ -36,67 +36,67 @@ def configure(env):
 
     env.Append(CPPPATH=['#platform/osx'])
 
-    if (env["bits"]=="default"):
-        env["bits"]="32"
+    if (env["bits"] == "default"):
+        env["bits"] = "32"
 
-    if (env["target"]=="release"):
+    if (env["target"] == "release"):
 
-        env.Append(CCFLAGS=['-O2','-ffast-math','-fomit-frame-pointer','-ftree-vectorize','-msse2'])
+        env.Append(CCFLAGS=['-O2', '-ffast-math', '-fomit-frame-pointer', '-ftree-vectorize', '-msse2'])
 
-    elif (env["target"]=="release_debug"):
+    elif (env["target"] == "release_debug"):
 
-        env.Append(CCFLAGS=['-O2','-DDEBUG_ENABLED'])
+        env.Append(CCFLAGS=['-O2', '-DDEBUG_ENABLED'])
 
-    elif (env["target"]=="debug"):
+    elif (env["target"] == "debug"):
 
-        env.Append(CCFLAGS=['-g3', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
+        env.Append(CCFLAGS=['-g3', '-Wall', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
 
 
 
     if (not os.environ.has_key("OSXCROSS_ROOT")):
-        #regular native build
-        if (env["bits"]=="64"):
+        # regular native build
+        if (env["bits"] == "64"):
             env.Append(CCFLAGS=['-arch', 'x86_64'])
             env.Append(LINKFLAGS=['-arch', 'x86_64'])
-        elif (env["bits"]=="32"):
+        elif (env["bits"] == "32"):
             env.Append(CCFLAGS=['-arch', 'i386'])
             env.Append(LINKFLAGS=['-arch', 'i386'])
         else:
             env.Append(CCFLAGS=['-arch', 'i386', '-arch', 'x86_64'])
             env.Append(LINKFLAGS=['-arch', 'i386', '-arch', 'x86_64'])
     else:
-        #osxcross build
-        root=os.environ.get("OSXCROSS_ROOT",0)
-        if env["bits"]=="64":
-            basecmd=root+"/target/bin/x86_64-apple-"+env["osxcross_sdk"]+"-"
+        # osxcross build
+        root = os.environ.get("OSXCROSS_ROOT", 0)
+        if env["bits"] == "64":
+            basecmd = root + "/target/bin/x86_64-apple-" + env["osxcross_sdk"] + "-"
         else:
-            basecmd=root+"/target/bin/i386-apple-"+env["osxcross_sdk"]+"-"
+            basecmd = root + "/target/bin/i386-apple-" + env["osxcross_sdk"] + "-"
 
 
-        env['CC'] = basecmd+"cc"
-        env['CXX'] = basecmd+"c++"
-        env['AR'] = basecmd+"ar"
-        env['RANLIB'] = basecmd+"ranlib"
-        env['AS'] = basecmd+"as"
+        env['CC'] = basecmd + "cc"
+        env['CXX'] = basecmd + "c++"
+        env['AR'] = basecmd + "ar"
+        env['RANLIB'] = basecmd + "ranlib"
+        env['AS'] = basecmd + "as"
 
 
     env.Append(CPPFLAGS=["-DAPPLE_STYLE_KEYS"])
-    env.Append(CPPFLAGS=['-DUNIX_ENABLED','-DGLES2_ENABLED','-DOSX_ENABLED'])
+    env.Append(CPPFLAGS=['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DOSX_ENABLED'])
     env.Append(LIBS=['pthread'])
     #env.Append(CPPFLAGS=['-F/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks', '-isysroot', '/Developer/SDKs/MacOSX10.4u.sdk', '-mmacosx-version-min=10.4'])
     #env.Append(LINKFLAGS=['-mmacosx-version-min=10.4', '-isysroot', '/Developer/SDKs/MacOSX10.4u.sdk', '-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk'])
-    env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit','-lz', '-framework', 'IOKit', '-framework', 'ForceFeedback'])
+    env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit', '-lz', '-framework', 'IOKit', '-framework', 'ForceFeedback'])
 
-    if (env["CXX"]=="clang++"):
+    if (env["CXX"] == "clang++"):
         env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
-        env["CC"]="clang"
-        env["LD"]="clang++"
+        env["CC"] = "clang"
+        env["LD"] = "clang++"
 
     import methods
 
-    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')})
     #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
 
-    env["x86_libtheora_opt_gcc"]=True
+    env["x86_libtheora_opt_gcc"] = True

platform/server/SCsub

@@ -3,8 +3,8 @@
 Import('env')
 
 
-common_server=[\
+common_server = [\
     "os_server.cpp",\
 ]
 
-env.Program('#bin/godot_server',['godot_server.cpp']+common_server)
+env.Program('#bin/godot_server', ['godot_server.cpp'] + common_server)

platform/server/detect.py

@@ -12,16 +12,16 @@ def get_name():
 
 def can_build():
 
-    if (os.name!="posix"):
+    if (os.name != "posix"):
         return False
 
-    return True # enabled
+    return True  # enabled
 
 def get_opts():
 
     return [
-        ('use_llvm','Use llvm compiler','no'),
-        ('force_32_bits','Force 32 bits binary','no')
+        ('use_llvm', 'Use llvm compiler', 'no'),
+        ('force_32_bits', 'Force 32 bits binary', 'no')
     ]
 
 def get_flags():
@@ -34,43 +34,43 @@ def get_flags():
 def configure(env):
 
     env.Append(CPPPATH=['#platform/server'])
-    if (env["use_llvm"]=="yes"):
-        env["CC"]="clang"
-        env["CXX"]="clang++"
-        env["LD"]="clang++"
+    if (env["use_llvm"] == "yes"):
+        env["CC"] = "clang"
+        env["CXX"] = "clang++"
+        env["LD"] = "clang++"
 
-    is64=sys.maxsize > 2**32
+    is64 = sys.maxsize > 2**32
 
-    if (env["bits"]=="default"):
+    if (env["bits"] == "default"):
         if (is64):
-            env["bits"]="64"
+            env["bits"] = "64"
         else:
-            env["bits"]="32"
+            env["bits"] = "32"
 
 
-    #if (env["tools"]=="no"):
+    # if (env["tools"]=="no"):
     #	#no tools suffix
     #	env['OBJSUFFIX'] = ".nt"+env['OBJSUFFIX']
     #	env['LIBSUFFIX'] = ".nt"+env['LIBSUFFIX']
 
 
-    if (env["target"]=="release"):
+    if (env["target"] == "release"):
 
-        env.Append(CCFLAGS=['-O2','-ffast-math','-fomit-frame-pointer'])
+        env.Append(CCFLAGS=['-O2', '-ffast-math', '-fomit-frame-pointer'])
 
-    elif (env["target"]=="release_debug"):
+    elif (env["target"] == "release_debug"):
 
-        env.Append(CCFLAGS=['-O2','-ffast-math','-DDEBUG_ENABLED'])
+        env.Append(CCFLAGS=['-O2', '-ffast-math', '-DDEBUG_ENABLED'])
 
-    elif (env["target"]=="debug"):
+    elif (env["target"] == "debug"):
 
-        env.Append(CCFLAGS=['-g2', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
+        env.Append(CCFLAGS=['-g2', '-Wall', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
 
-    env.Append(CPPFLAGS=['-DSERVER_ENABLED','-DUNIX_ENABLED'])
-    env.Append(LIBS=['pthread','z']) #TODO detect linux/BSD!
+    env.Append(CPPFLAGS=['-DSERVER_ENABLED', '-DUNIX_ENABLED'])
+    env.Append(LIBS=['pthread', 'z'])  # TODO detect linux/BSD!
 
-    if (env["CXX"]=="clang++"):
+    if (env["CXX"] == "clang++"):
         env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
-        env["CC"]="clang"
-        env["LD"]="clang++"
+        env["CC"] = "clang"
+        env["LD"] = "clang++"
 

platform/windows/SCsub

@@ -3,7 +3,7 @@
 Import('env')
 
 
-common_win=[
+common_win = [
     "context_gl_win.cpp",
     "os_windows.cpp",
     "ctxgl_procaddr.cpp",
@@ -14,16 +14,16 @@ common_win=[
     "joystick.cpp",
 ]
 
-restarget="godot_res"+env["OBJSUFFIX"]
+restarget = "godot_res" + env["OBJSUFFIX"]
 
-obj = env.RES(restarget,'godot_res.rc')
+obj = env.RES(restarget, 'godot_res.rc')
 
 common_win.append(obj)
 
-env.Program('#bin/godot',['godot_win.cpp']+common_win,PROGSUFFIX=env["PROGSUFFIX"])
+env.Program('#bin/godot', ['godot_win.cpp'] + common_win, PROGSUFFIX=env["PROGSUFFIX"])
 
 # Microsoft Visual Studio Project Generation
-if (env['vsproj'])=="yes":
+if (env['vsproj']) == "yes":
     env.vs_srcs = env.vs_srcs + ["platform/windows/godot_win.cpp"]
     for x in common_win:
         env.vs_srcs = env.vs_srcs + ["platform/windows/" + str(x)]

platform/winrt/detect.py

@@ -12,8 +12,8 @@ def get_name():
     return "WinRT"
 
 def can_build():
-    if (os.name=="nt"):
-        #building natively on windows!
+    if (os.name == "nt"):
+        # building natively on windows!
         if (os.getenv("VSINSTALLDIR")):
 
             if (os.getenv("ANGLE_SRC_PATH") == None):
@@ -40,8 +40,8 @@ def configure(env):
     if(env["bits"] != "default"):
         print "Error: bits argument is disabled for MSVC"
         print ("Bits argument is not supported for MSVC compilation. Architecture depends on the Native/Cross Compile Tools Prompt/Developer Console (or Visual Studio settings)"
-               +" that is being used to run SCons. As a consequence, bits argument is disabled. Run scons again without bits argument (example: scons p=winrt) and SCons will attempt to detect what MSVC compiler"
-               +" will be executed and inform you.")
+               + " that is being used to run SCons. As a consequence, bits argument is disabled. Run scons again without bits argument (example: scons p=winrt) and SCons will attempt to detect what MSVC compiler"
+               + " will be executed and inform you.")
         sys.exit()
 
     arch = ""
@@ -60,8 +60,8 @@ def configure(env):
 
         print "Compiled program architecture will be an ARM executable. (forcing bits=32)."
 
-        arch="arm"
-        env["bits"]="32"
+        arch = "arm"
+        env["bits"] = "32"
         env.Append(LINKFLAGS=['/MACHINE:ARM'])
         env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store/arm'])
 
@@ -74,14 +74,14 @@ def configure(env):
         compiler_version_str = methods.detect_visual_c_compiler_version(env['ENV'])
 
         if(compiler_version_str == "amd64" or compiler_version_str == "x86_amd64"):
-            env["bits"]="64"
+            env["bits"] = "64"
             print "Compiled program architecture will be a x64 executable (forcing bits=64)."
-        elif (compiler_version_str=="x86" or compiler_version_str == "amd64_x86"):
-            env["bits"]="32"
+        elif (compiler_version_str == "x86" or compiler_version_str == "amd64_x86"):
+            env["bits"] = "32"
             print "Compiled program architecture will be a x86 executable. (forcing bits=32)."
         else:
             print "Failed to detect MSVC compiler architecture version... Defaulting to 32bit executable settings (forcing bits=32). Compilation attempt will continue, but SCons can not detect for what architecture this build is compiled for. You should check your settings/compilation setup."
-            env["bits"]="32"
+            env["bits"] = "32"
 
         if (env["bits"] == "32"):
             arch = "x86"
@@ -102,29 +102,29 @@ def configure(env):
             env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store/amd64'])
             env.Append(LIBPATH=[angle_root + '/winrt/10/src/Release_x64/lib'])
 
-    env.Append(CPPPATH=['#platform/winrt','#drivers/windows'])
+    env.Append(CPPPATH=['#platform/winrt', '#drivers/windows'])
     env.Append(LINKFLAGS=['/MANIFEST:NO', '/NXCOMPAT', '/DYNAMICBASE', '/WINMD', '/APPCONTAINER', '/ERRORREPORT:PROMPT', '/NOLOGO', '/TLBID:1', '/NODEFAULTLIB:"kernel32.lib"', '/NODEFAULTLIB:"ole32.lib"'])
-    env.Append(CPPFLAGS=['/D','__WRL_NO_DEFAULT_LIB__','/D','WIN32'])
+    env.Append(CPPFLAGS=['/D', '__WRL_NO_DEFAULT_LIB__', '/D', 'WIN32'])
     env.Append(CPPFLAGS=['/FU', os.environ['VCINSTALLDIR'] + 'lib/store/references/platform.winmd'])
     env.Append(CPPFLAGS=['/AI', os.environ['VCINSTALLDIR'] + 'lib/store/references'])
 
     env.Append(LIBPATH=[os.environ['VCINSTALLDIR'] + 'lib/store/references'])
 
-    if (env["target"]=="release"):
+    if (env["target"] == "release"):
 
         env.Append(CPPFLAGS=['/O2', '/GL'])
         env.Append(CPPFLAGS=['/MD'])
         env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS', '/LTCG'])
 
-    elif (env["target"]=="release_debug"):
+    elif (env["target"] == "release_debug"):
 
-        env.Append(CCFLAGS=['/O2','/Zi','/DDEBUG_ENABLED'])
+        env.Append(CCFLAGS=['/O2', '/Zi', '/DDEBUG_ENABLED'])
         env.Append(CPPFLAGS=['/MD'])
         env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
 
-    elif (env["target"]=="debug"):
+    elif (env["target"] == "debug"):
 
-        env.Append(CCFLAGS=['/Zi','/DDEBUG_ENABLED','/DDEBUG_MEMORY_ENABLED'])
+        env.Append(CCFLAGS=['/Zi', '/DDEBUG_ENABLED', '/DDEBUG_MEMORY_ENABLED'])
         env.Append(CPPFLAGS=['/MDd'])
         env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
         env.Append(LINKFLAGS=['/DEBUG'])
@@ -132,18 +132,18 @@ def configure(env):
 
     env.Append(CCFLAGS=string.split('/FS /MP /GS /wd"4453" /wd"28204" /wd"4291" /Zc:wchar_t /Gm- /fp:precise /D "_UNICODE" /D "UNICODE" /D "WINAPI_FAMILY=WINAPI_FAMILY_APP" /errorReport:prompt /WX- /Zc:forScope /Gd /EHsc /nologo'))
     env.Append(CXXFLAGS=string.split('/ZW /FS'))
-    env.Append(CCFLAGS=['/AI', os.environ['VCINSTALLDIR']+'\\vcpackages', '/AI', os.environ['WINDOWSSDKDIR']+'\\References\\CommonConfiguration\\Neutral'])
+    env.Append(CCFLAGS=['/AI', os.environ['VCINSTALLDIR'] + '\\vcpackages', '/AI', os.environ['WINDOWSSDKDIR'] + '\\References\\CommonConfiguration\\Neutral'])
 
 
-    env["PROGSUFFIX"]="."+arch+env["PROGSUFFIX"]
-    env["OBJSUFFIX"]="."+arch+env["OBJSUFFIX"]
-    env["LIBSUFFIX"]="."+arch+env["LIBSUFFIX"]
+    env["PROGSUFFIX"] = "." + arch + env["PROGSUFFIX"]
+    env["OBJSUFFIX"] = "." + arch + env["OBJSUFFIX"]
+    env["LIBSUFFIX"] = "." + arch + env["LIBSUFFIX"]
 
     env.Append(CCFLAGS=['/DWINRT_ENABLED'])
     env.Append(CCFLAGS=['/DWINDOWS_ENABLED'])
     env.Append(CCFLAGS=['/DTYPED_METHOD_BIND'])
 
-    env.Append(CCFLAGS=['/DGLES2_ENABLED','/DGL_GLEXT_PROTOTYPES','/DEGL_EGLEXT_PROTOTYPES','/DANGLE_ENABLED'])
+    env.Append(CCFLAGS=['/DGLES2_ENABLED', '/DGL_GLEXT_PROTOTYPES', '/DEGL_EGLEXT_PROTOTYPES', '/DANGLE_ENABLED'])
 
     LIBS = [
         'WindowsApp',
@@ -152,15 +152,15 @@ def configure(env):
         'libEGL',
         'libGLESv2',
     ]
-    env.Append(LINKFLAGS=[p+".lib" for p in LIBS])
+    env.Append(LINKFLAGS=[p + ".lib" for p in LIBS])
 
     # Incremental linking fix
     env['BUILDERS']['ProgramOriginal'] = env['BUILDERS']['Program']
     env['BUILDERS']['Program'] = methods.precious_program
 
-    env.Append( BUILDERS = { 'ANGLE' : env.Builder(action = angle_build_cmd) } )
+    env.Append(BUILDERS={'ANGLE': env.Builder(action=angle_build_cmd)})
 
-    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-    env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
-    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'HLSL9': env.Builder(action=methods.build_hlsl_dx9_headers, suffix='hlsl.h', src_suffix='.hlsl')})
+    env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')})

platform/x11/SCsub

@@ -3,11 +3,11 @@
 Import('env')
 
 
-common_x11=[\
+common_x11 = [\
     "context_gl_x11.cpp",\
     "os_x11.cpp",\
     "key_mapping_x11.cpp",\
     "joystick_linux.cpp",\
 ]
 
-env.Program('#bin/godot',['godot_x11.cpp']+common_x11)
+env.Program('#bin/godot', ['godot_x11.cpp'] + common_x11)

platform/x11/detect.py

@@ -13,56 +13,56 @@ def get_name():
 
 def can_build():
 
-    if (os.name!="posix"):
+    if (os.name != "posix"):
         return False
 
     if sys.platform == "darwin":
-        return False # no x11 on mac for now
+        return False  # no x11 on mac for now
 
-    errorval=os.system("pkg-config --version > /dev/null")
+    errorval = os.system("pkg-config --version > /dev/null")
 
     if (errorval):
         print("pkg-config not found.. x11 disabled.")
         return False
 
-    x11_error=os.system("pkg-config x11 --modversion > /dev/null ")
+    x11_error = os.system("pkg-config x11 --modversion > /dev/null ")
     if (x11_error):
         print("X11 not found.. x11 disabled.")
         return False
 
-    ssl_error=os.system("pkg-config openssl --modversion > /dev/null ")
+    ssl_error = os.system("pkg-config openssl --modversion > /dev/null ")
     if (ssl_error):
         print("OpenSSL not found.. x11 disabled.")
         return False
 
-    x11_error=os.system("pkg-config xcursor --modversion > /dev/null ")
+    x11_error = os.system("pkg-config xcursor --modversion > /dev/null ")
     if (x11_error):
         print("xcursor not found.. x11 disabled.")
         return False
 
-    x11_error=os.system("pkg-config xinerama --modversion > /dev/null ")
+    x11_error = os.system("pkg-config xinerama --modversion > /dev/null ")
     if (x11_error):
         print("xinerama not found.. x11 disabled.")
         return False
 
-    x11_error=os.system("pkg-config xrandr --modversion > /dev/null ")
+    x11_error = os.system("pkg-config xrandr --modversion > /dev/null ")
     if (x11_error):
         print("xrandr not found.. x11 disabled.")
         return False
 
 
-    return True # X11 enabled
+    return True  # X11 enabled
 
 def get_opts():
 
     return [
-        ('use_llvm','Use llvm compiler','no'),
-        ('use_static_cpp','link stdc++ statically','no'),
-        ('use_sanitizer','Use llvm compiler sanitize address','no'),
-        ('use_leak_sanitizer','Use llvm compiler sanitize memory leaks','no'),
-        ('pulseaudio','Detect & Use pulseaudio','yes'),
-        ('udev','Use udev for gamepad connection callbacks','no'),
-        ('debug_release', 'Add debug symbols to release version','no'),
+        ('use_llvm', 'Use llvm compiler', 'no'),
+        ('use_static_cpp', 'link stdc++ statically', 'no'),
+        ('use_sanitizer', 'Use llvm compiler sanitize address', 'no'),
+        ('use_leak_sanitizer', 'Use llvm compiler sanitize memory leaks', 'no'),
+        ('pulseaudio', 'Detect & Use pulseaudio', 'yes'),
+        ('udev', 'Use udev for gamepad connection callbacks', 'no'),
+        ('debug_release', 'Add debug symbols to release version', 'no'),
     ]
 
 def get_flags():
@@ -77,56 +77,56 @@ def get_flags():
 
 def configure(env):
 
-    is64=sys.maxsize > 2**32
+    is64 = sys.maxsize > 2**32
 
-    if (env["bits"]=="default"):
+    if (env["bits"] == "default"):
         if (is64):
-            env["bits"]="64"
+            env["bits"] = "64"
         else:
-            env["bits"]="32"
+            env["bits"] = "32"
 
     env.Append(CPPPATH=['#platform/x11'])
-    if (env["use_llvm"]=="yes"):
+    if (env["use_llvm"] == "yes"):
         if 'clang++' not in env['CXX']:
-            env["CC"]="clang"
-            env["CXX"]="clang++"
-            env["LD"]="clang++"
+            env["CC"] = "clang"
+            env["CXX"] = "clang++"
+            env["LD"] = "clang++"
         env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
-        env.extra_suffix=".llvm"
+        env.extra_suffix = ".llvm"
 
-    if (env["use_sanitizer"]=="yes"):
-        env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
+    if (env["use_sanitizer"] == "yes"):
+        env.Append(CXXFLAGS=['-fsanitize=address', '-fno-omit-frame-pointer'])
         env.Append(LINKFLAGS=['-fsanitize=address'])
-        env.extra_suffix+="s"
+        env.extra_suffix += "s"
 
-    if (env["use_leak_sanitizer"]=="yes"):
-        env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
+    if (env["use_leak_sanitizer"] == "yes"):
+        env.Append(CXXFLAGS=['-fsanitize=address', '-fno-omit-frame-pointer'])
         env.Append(LINKFLAGS=['-fsanitize=address'])
-        env.extra_suffix+="s"
+        env.extra_suffix += "s"
 
 
-    #if (env["tools"]=="no"):
+    # if (env["tools"]=="no"):
     #	#no tools suffix
     #	env['OBJSUFFIX'] = ".nt"+env['OBJSUFFIX']
     #	env['LIBSUFFIX'] = ".nt"+env['LIBSUFFIX']
 
 
-    if (env["target"]=="release"):
+    if (env["target"] == "release"):
 
-        if (env["debug_release"]=="yes"):
+        if (env["debug_release"] == "yes"):
             env.Append(CCFLAGS=['-g2'])
         else:
-            env.Append(CCFLAGS=['-O3','-ffast-math'])
+            env.Append(CCFLAGS=['-O3', '-ffast-math'])
 
-    elif (env["target"]=="release_debug"):
+    elif (env["target"] == "release_debug"):
 
-        env.Append(CCFLAGS=['-O2','-ffast-math','-DDEBUG_ENABLED'])
-        if (env["debug_release"]=="yes"):
+        env.Append(CCFLAGS=['-O2', '-ffast-math', '-DDEBUG_ENABLED'])
+        if (env["debug_release"] == "yes"):
             env.Append(CCFLAGS=['-g2'])
 
-    elif (env["target"]=="debug"):
+    elif (env["target"] == "debug"):
 
-        env.Append(CCFLAGS=['-g2', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED'])
+        env.Append(CCFLAGS=['-g2', '-Wall', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
 
     env.ParseConfig('pkg-config x11 --cflags --libs')
     env.ParseConfig('pkg-config xinerama --cflags --libs')
@@ -180,7 +180,7 @@ def configure(env):
     if (env["glew"] == "system"):
         env.ParseConfig('pkg-config glew --cflags --libs')
 
-    if os.system("pkg-config --exists alsa")==0:
+    if os.system("pkg-config --exists alsa") == 0:
         print("Enabling ALSA")
         env.Append(CPPFLAGS=["-DALSA_ENABLED"])
         env.ParseConfig('pkg-config alsa --cflags --libs')
@@ -189,7 +189,7 @@ def configure(env):
 
     if (platform.system() == "Linux"):
         env.Append(CPPFLAGS=["-DJOYDEV_ENABLED"])
-    if (env["udev"]=="yes"):
+    if (env["udev"] == "yes"):
         # pkg-config returns 0 when the lib exists...
         found_udev = not os.system("pkg-config --exists libudev")
 
@@ -200,7 +200,7 @@ def configure(env):
         else:
             print("libudev development libraries not found, disabling udev support")
 
-    if (env["pulseaudio"]=="yes"):
+    if (env["pulseaudio"] == "yes"):
         if not os.system("pkg-config --exists libpulse-simple"):
             print("Enabling PulseAudio")
             env.Append(CPPFLAGS=["-DPULSEAUDIO_ENABLED"])
@@ -208,33 +208,33 @@ def configure(env):
         else:
             print("PulseAudio development libraries not found, disabling driver")
 
-    env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES_OVER_GL'])
+    env.Append(CPPFLAGS=['-DX11_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL'])
     env.Append(LIBS=['GL', 'pthread', 'z'])
     if (platform.system() == "Linux"):
         env.Append(LIBS='dl')
-    #env.Append(CPPFLAGS=['-DMPC_FIXED_POINT'])
+    # env.Append(CPPFLAGS=['-DMPC_FIXED_POINT'])
 
-#host compiler is default..
+# host compiler is default..
 
-    if (is64 and env["bits"]=="32"):
+    if (is64 and env["bits"] == "32"):
         env.Append(CPPFLAGS=['-m32'])
-        env.Append(LINKFLAGS=['-m32','-L/usr/lib/i386-linux-gnu'])
-    elif (not is64 and env["bits"]=="64"):
+        env.Append(LINKFLAGS=['-m32', '-L/usr/lib/i386-linux-gnu'])
+    elif (not is64 and env["bits"] == "64"):
         env.Append(CPPFLAGS=['-m64'])
-        env.Append(LINKFLAGS=['-m64','-L/usr/lib/i686-linux-gnu'])
+        env.Append(LINKFLAGS=['-m64', '-L/usr/lib/i686-linux-gnu'])
 
 
     import methods
 
-    env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-    env.Append( BUILDERS = { 'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
-    env.Append( BUILDERS = { 'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )
+    env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')})
     #env.Append( BUILDERS = { 'HLSL9' : env.Builder(action = methods.build_hlsl_dx9_headers, suffix = 'hlsl.h',src_suffix = '.hlsl') } )
 
-    if (env["use_static_cpp"]=="yes"):
+    if (env["use_static_cpp"] == "yes"):
         env.Append(LINKFLAGS=['-static-libstdc++'])
 
     list_of_x86 = ['x86_64', 'x86', 'i386', 'i586']
     if any(platform.machine() in s for s in list_of_x86):
-        env["x86_libtheora_opt_gcc"]=True
+        env["x86_libtheora_opt_gcc"] = True
 

scene/2d/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.scene_sources,"*.cpp")
+env.add_source_files(env.scene_sources, "*.cpp")
 
 Export('env')

scene/3d/SCsub

@@ -3,11 +3,11 @@
 Import('env')
 
 
-if (env["disable_3d"]=="yes"):
+if (env["disable_3d"] == "yes"):
 
     env.scene_sources.append("3d/spatial.cpp")
     env.scene_sources.append("3d/skeleton.cpp")
 else:
-    env.add_source_files(env.scene_sources,"*.cpp")
+    env.add_source_files(env.scene_sources, "*.cpp")
 
 Export('env')

scene/SCsub

@@ -2,8 +2,8 @@
 
 Import('env')
 
-env.scene_sources=[]
-env.add_source_files(env.scene_sources,"*.cpp")
+env.scene_sources = []
+env.add_source_files(env.scene_sources, "*.cpp")
 
 Export('env')
 
@@ -17,6 +17,6 @@ SConscript('resources/SCsub');
 SConscript('io/SCsub');
 
 
-lib = env.Library("scene",env.scene_sources)
+lib = env.Library("scene", env.scene_sources)
 
 env.Prepend(LIBS=[lib])

scene/animation/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.scene_sources,"*.cpp")
+env.add_source_files(env.scene_sources, "*.cpp")
 
 Export('env')

scene/audio/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.scene_sources,"*.cpp")
+env.add_source_files(env.scene_sources, "*.cpp")
 
 Export('env')

scene/gui/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.scene_sources,"*.cpp")
+env.add_source_files(env.scene_sources, "*.cpp")
 
 Export('env')

scene/io/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.scene_sources,"*.cpp")
+env.add_source_files(env.scene_sources, "*.cpp")
 
 Export('env')

scene/main/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.scene_sources,"*.cpp")
+env.add_source_files(env.scene_sources, "*.cpp")
 
 Export('env')

scene/resources/SCsub

@@ -2,8 +2,8 @@
 
 Import('env')
 
-env.add_source_files(env.scene_sources,"*.cpp")
-env.add_source_files(env.scene_sources,"*.c")
+env.add_source_files(env.scene_sources, "*.cpp")
+env.add_source_files(env.scene_sources, "*.c")
 
 Export('env')
 

scene/resources/default_theme/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.scene_sources,"*.cpp")
+env.add_source_files(env.scene_sources, "*.cpp")
 
 Export('env')

scene/resources/default_theme/make_header.py

@@ -4,15 +4,15 @@ import glob;
 import string;
 
 
-#Generate include files
+# Generate include files
 
-f=open("theme_data.h","wb")
+f = open("theme_data.h", "wb")
 
 f.write("// THIS FILE HAS BEEN AUTOGENERATED, DONT EDIT!!\n");
 
 f.write("\n\n");
 
-#Generate png image block
+# Generate png image block
 
 pixmaps = glob.glob("*.png");
 
@@ -22,23 +22,23 @@ 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);
-    while(len(b)==1):
+    b = pngf.read(1);
+    while(len(b) == 1):
         f.write(hex(ord(b)))
-        b=pngf.read(1);
-        if (len(b)==1):
+        b = pngf.read(1);
+        if (len(b) == 1):
             f.write(",")
 
     f.write("\n};\n\n\n");
     pngf.close();
 
-#Generate shaders block
+# Generate shaders block
 
 shaders = glob.glob("*.gsl")
 
@@ -48,22 +48,22 @@ 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();
-    while(b!=""):
+    b = sf.readline();
+    while(b != ""):
         if (b.endswith("\r\n")):
-            b=b[:-2]
+            b = b[:-2]
         if (b.endswith("\n")):
-            b=b[:-1]
-        f.write("			\""+b)
-        b=sf.readline();
-        if (b!=""):
+            b = b[:-1]
+        f.write("			\"" + b)
+        b = sf.readline();
+        if (b != ""):
             f.write("\"\n")
 
     f.write("\";\n\n\n");

servers/SCsub

@@ -2,8 +2,8 @@
 
 Import('env')
 
-env.servers_sources=[]
-env.add_source_files(env.servers_sources,"*.cpp")
+env.servers_sources = []
+env.add_source_files(env.servers_sources, "*.cpp")
 
 Export('env')
 
@@ -14,6 +14,6 @@ SConscript('audio/SCsub');
 SConscript('spatial_sound/SCsub');
 SConscript('spatial_sound_2d/SCsub');
 
-lib = env.Library("servers",env.servers_sources)
+lib = env.Library("servers", env.servers_sources)
 
 env.Prepend(LIBS=[lib])

servers/audio/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.servers_sources,"*.cpp")
+env.add_source_files(env.servers_sources, "*.cpp")
 
 Export('env')

servers/physics/SCsub

@@ -2,7 +2,7 @@
 
 Import('env')
 
-env.add_source_files(env.servers_sources,"*.cpp")
+env.add_source_files(env.servers_sources, "*.cpp")
 
 Export('env')
 

servers/physics/joints/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.servers_sources,"*.cpp")
+env.add_source_files(env.servers_sources, "*.cpp")
 
 Export('env')

servers/physics_2d/SCsub

@@ -2,4 +2,4 @@
 
 Import('env')
 
-env.add_source_files(env.servers_sources,"*.cpp")
+env.add_source_files(env.servers_sources, "*.cpp")

servers/spatial_sound/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.servers_sources,"*.cpp")
+env.add_source_files(env.servers_sources, "*.cpp")
 
 Export('env')

servers/spatial_sound_2d/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.servers_sources,"*.cpp")
+env.add_source_files(env.servers_sources, "*.cpp")
 
 Export('env')

servers/visual/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.servers_sources,"*.cpp")
+env.add_source_files(env.servers_sources, "*.cpp")
 
 Export('env')

tools/SCsub

@@ -2,18 +2,18 @@
 
 Import('env')
 
-env.tool_sources=[]
-env.add_source_files(env.tool_sources,"*.cpp")
+env.tool_sources = []
+env.add_source_files(env.tool_sources, "*.cpp")
 
 Export('env')
 
 
-def make_translations_header(target,source,env):
+def make_translations_header(target, source, env):
 
 
     dst = target[0].srcnode().abspath
 
-    g = open(dst,"wb")
+    g = open(dst, "wb")
 
 
     """"
@@ -29,24 +29,24 @@ def make_translations_header(target,source,env):
     paths = [node.srcnode().abspath for node in source]
     sorted_paths = sorted(paths, key=lambda path: os.path.splitext(os.path.basename(path))[0])
 
-    xl_names=[]
+    xl_names = []
     for i in range(len(sorted_paths)):
-        print("Appending translation: "+sorted_paths[i])
-        f = open(sorted_paths[i],"rb")
+        print("Appending translation: " + sorted_paths[i])
+        f = open(sorted_paths[i], "rb")
         buf = f.read()
         decomp_size = len(buf)
         buf = zlib.compress(buf)
-        name =  os.path.splitext(os.path.basename(sorted_paths[i]))[0]
+        name = os.path.splitext(os.path.basename(sorted_paths[i]))[0]
 
         #g.write("static const int _translation_"+name+"_compressed_size="+str(len(buf))+";\n")
         #g.write("static const int _translation_"+name+"_uncompressed_size="+str(decomp_size)+";\n")
-        g.write("static const unsigned char _translation_"+name+"_compressed[]={\n")
+        g.write("static const unsigned char _translation_" + name + "_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")
 
-        xl_names.append([name,len(buf),str(decomp_size)])
+        xl_names.append([name, len(buf), str(decomp_size)])
 
     g.write("struct EditorTranslationList {\n")
     g.write("\tconst char* lang;\n");
@@ -56,19 +56,19 @@ def make_translations_header(target,source,env):
     g.write("};\n\n");
     g.write("static EditorTranslationList _editor_translations[]={\n")
     for x in xl_names:
-        g.write("\t{ \""+x[0]+"\", "+str(x[1])+", "+str(x[2])+",_translation_"+x[0]+"_compressed},\n")
+        g.write("\t{ \"" + x[0] + "\", " + str(x[1]) + ", " + str(x[2]) + ",_translation_" + x[0] + "_compressed},\n")
     g.write("\t{NULL,0,0,NULL}\n")
     g.write("};\n")
 
     g.write("#endif")
 
 
-def make_fonts_header(target,source,env):
+def make_fonts_header(target, source, env):
 
 
     dst = target[0].srcnode().abspath
 
-    g = open(dst,"wb")
+    g = open(dst, "wb")
 
 
     """"
@@ -78,48 +78,48 @@ def make_fonts_header(target,source,env):
     g.write("#ifndef _EDITOR_FONTS_H\n")
     g.write("#define _EDITOR_FONTS_H\n")
 
-    #saving uncompressed, since freetype will reference from memory pointer
-    xl_names=[]
+    # saving uncompressed, since freetype will reference from memory pointer
+    xl_names = []
     for i in range(len(source)):
-        print("Appending font: "+source[i].srcnode().abspath)
-        f = open(source[i].srcnode().abspath,"rb")
+        print("Appending font: " + source[i].srcnode().abspath)
+        f = open(source[i].srcnode().abspath, "rb")
         buf = f.read()
         import os.path
 
-        name =  os.path.splitext(os.path.basename(source[i].srcnode().abspath))[0]
+        name = os.path.splitext(os.path.basename(source[i].srcnode().abspath))[0]
 
-        g.write("static const int _font_"+name+"_size="+str(len(buf))+";\n")
-        g.write("static const unsigned char _font_"+name+"[]={\n")
+        g.write("static const int _font_" + name + "_size=" + str(len(buf)) + ";\n")
+        g.write("static const unsigned char _font_" + name + "[]={\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")
 
 
-if (env["tools"]!="no"):
+if (env["tools"] != "no"):
 
     import glob
 
     dir = env.Dir('.').abspath
     tlist = glob.glob(dir + "/translations/*.po")
 
-    print("translations: ",tlist)
-    env.Depends('#tools/editor/translations.h',tlist)
-    env.Command('#tools/editor/translations.h',tlist,make_translations_header)
+    print("translations: ", tlist)
+    env.Depends('#tools/editor/translations.h', tlist)
+    env.Command('#tools/editor/translations.h', tlist, make_translations_header)
 
     flist = glob.glob(dir + "/editor_fonts/*.ttf")
-    flist.append( glob.glob(dir + "/editor_fonts/*.otf") )
+    flist.append(glob.glob(dir + "/editor_fonts/*.otf"))
 
-    print("fonts: ",flist)
-    env.Depends('#tools/editor/builtin_fonts.h',flist)
-    env.Command('#tools/editor/builtin_fonts.h',flist,make_fonts_header)
+    print("fonts: ", flist)
+    env.Depends('#tools/editor/builtin_fonts.h', flist)
+    env.Command('#tools/editor/builtin_fonts.h', flist, make_fonts_header)
 
     SConscript('editor/SCsub');
     SConscript('collada/SCsub');
     SConscript('doc/SCsub')
 
-    lib = env.Library("tool",env.tool_sources)
+    lib = env.Library("tool", env.tool_sources)
 
     env.Prepend(LIBS=[lib])

tools/collada/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.tool_sources,"*.cpp")
+env.add_source_files(env.tool_sources, "*.cpp")
 
 Export('env')

tools/doc/SCsub

@@ -2,6 +2,6 @@
 
 Import('env')
 
-env.add_source_files(env.tool_sources,"*.cpp")
+env.add_source_files(env.tool_sources, "*.cpp")
 
 Export('env')

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');

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")

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");
 
 
 
@@ -75,24 +75,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')

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")

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")

tools/scripts/addheader.py

-header="""\
+header = """\
 /*************************************************************************/
 /*  $filename                                                            */
 /*************************************************************************/
@@ -29,44 +29,44 @@ header="""\
 /*************************************************************************/
 """
 
-f = open("files","rb")
+f = open("files", "rb")
 
 fname = f.readline()
-while (fname!=""):
+while (fname != ""):
 
-    fr = open(fname.strip(),"rb")
+    fr = open(fname.strip(), "rb")
     l = fr.readline()
-    bc=False
+    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)
+    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)
+        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 = open(fname.strip(), "wb")
     fr.write(text)
     fr.close()
-    #print(text)
-    fname=f.readline()
+    # print(text)
+    fname = f.readline()
 

tools/scripts/file-hex-array.py

@@ -5,27 +5,27 @@ import sys
 def tof(filepath):
     with open(filepath, 'r') as f:
         content = f.read()
-    content = content.replace("0x","")
+    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:
+    with open(filepath + ".file", 'wb') as f:
         content = f.write(content.decode("hex"))
-    print(os.path.basename(filepath)+".file created.")
+    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 = [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 = content.replace("0x00", "0x0")
+    with open(filepath + ".array", 'w') as f:
         content = f.write(content)
-    print(os.path.basename(filepath)+".array created.")
+    print(os.path.basename(filepath) + ".array created.")
     exit(0)
 
 def usage():

tools/scripts/make_bmfhdr.py

@@ -2,43 +2,43 @@
 
 import sys
 
-if (len(sys.argv)!=2):
+if (len(sys.argv) != 2):
     print("Pass me a .fnt argument!")
 
-f = open(sys.argv[1],"rb")
+f = open(sys.argv[1], "rb")
 
-name = sys.argv[1].lower().replace(".fnt","")
+name = sys.argv[1].lower().replace(".fnt", "")
 
 l = f.readline()
 
-font_height=0
-font_ascent=0
-font_charcount=0
-font_chars=[]
-font_cc=0
+font_height = 0
+font_ascent = 0
+font_charcount = 0
+font_chars = []
+font_cc = 0
 
-while(l!=""):
+while(l != ""):
 
     fs = l.strip().find(" ")
-    if (fs==-1):
-        l=f.readline()
+    if (fs == -1):
+        l = f.readline()
         continue
-    t  = l[0:fs]
+    t = l[0:fs]
 
-    dv = l[fs+1:].split(" ")
+    dv = l[fs + 1:].split(" ")
     d = {}
     for x in dv:
-        if (x.find("=")==-1):
+        if (x.find("=") == -1):
             continue
         s = x.split("=")
-        d[ s[0] ] = s[1]
+        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"):
+    if (t == "char"):
         font_chars.append(d["id"])
         font_chars.append(d["x"])
         font_chars.append(d["y"])
@@ -47,24 +47,24 @@ while(l!=""):
         font_chars.append(d["xoffset"])
         font_chars.append(d["yoffset"])
         font_chars.append(d["xadvance"])
-        font_cc+=1
+        font_cc += 1
 
 
 
     l = f.readline()
 
 
-print("static const int _bi_font_"+name+"_height="+str(font_height)+";")
-print("static const int _bi_font_"+name+"_ascent="+str(font_ascent)+";")
-print("static const int _bi_font_"+name+"_charcount="+str(font_cc)+";")
-cstr="static const int _bi_font_"+name+"_characters={"
+print("static const int _bi_font_" + name + "_height=" + str(font_height) + ";")
+print("static const int _bi_font_" + name + "_ascent=" + str(font_ascent) + ";")
+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+=("};")
+cstr += ("};")
 
 print(cstr)

tools/scripts/make_glwrapper.py

 #! /usr/bin/env python
 import sys
 
-if (len(sys.argv)<2):
+if (len(sys.argv) < 2):
     print("usage: make_glwrapper.py <headers>")
     sys.exit(255)
 
 
-functions=[]
-types=[]
-constants=[]
+functions = []
+types = []
+constants = []
 
-READ_FUNCTIONS=0
-READ_TYPES=1
-READ_CONSTANTS=2
+READ_FUNCTIONS = 0
+READ_TYPES = 1
+READ_CONSTANTS = 2
 
-read_what=READ_TYPES
+read_what = READ_TYPES
 
-for x in (range(len(sys.argv)-1)):
-    f=open(sys.argv[x+1],"r")
+for x in (range(len(sys.argv) - 1)):
+    f = open(sys.argv[x + 1], "r")
 
     while(True):
 
-        line=f.readline()
-        if (line==""):
+        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
@@ -38,67 +38,67 @@ 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):
+        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):
+        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):
+        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):
+            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):
+                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):
+            if (namepos == -1):
                 continue
 
-            name=line[:namepos].strip()
-            line=line[namepos:]
+            name = line[:namepos].strip()
+            line = line[namepos:]
 
-            argpos=line.rfind(")")
-            if (argpos==-1):
+            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)
 
 
 
-#print(types)
-#print(constants)
-#print(functions)
+# print(types)
+# print(constants)
+# print(functions)
 
 
-f=open("glwrapper.h","w")
+f = open("glwrapper.h", "w")
 
 f.write("#ifndef GL_WRAPPER\n")
 f.write("#define GL_WRAPPER\n\n\n")
 
-header_code="""\
+header_code = """\
 #if defined(__gl_h_) || defined(__GL_H__)
 #error gl.h included before glwrapper.h
 #endif
@@ -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");
@@ -158,21 +158,21 @@ f.write("#ifdef __cplusplus\n}\n#endif\n")
 
 f.write("#endif\n\n")
 
-f=open("glwrapper.c","w")
+f = open("glwrapper.c", "w")
 
 f.write("\n\n")
 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")

tools/scripts/makeargs.py

 
-text="""
+text = """
 #define FUNC$numR(m_r,m_func,$argt)\\
 	virtual m_r m_func($argtp) { \\
 		if (Thread::get_caller_ID()!=server_thread) {\\
@@ -65,21 +65,21 @@ text="""
 
 
 
-for i in range(1,8):
+for i in range(1, 8):
 
-    tp=""
-    p=""
-    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))
+        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)
 
 

tools/scripts/memsort.py

 
 import sys
 
-arg="memdump.txt"
+arg = "memdump.txt"
 
-if (len(sys.argv)>1):
-    arg=sys.argv[1]
+if (len(sys.argv) > 1):
+    arg = sys.argv[1]
 
-f = open(arg,"rb")
+f = open(arg, "rb")
 
 
-l=f.readline()
+l = f.readline()
 
 
 sum = {}
-cnt={}
+cnt = {}
 
 
-while(l!=""):
+while(l != ""):
 
-    s=l.split("-")
+    s = l.split("-")
     amount = int(s[1])
-    what=s[2]
+    what = s[2]
     if (what in sum):
-        sum[what]+=amount
-        cnt[what]+=1
+        sum[what] += amount
+        cnt[what] += 1
     else:
-        sum[what]=amount
-        cnt[what]=1
+        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]))

tools/scripts/svgs_2_pngs.py

@@ -51,7 +51,7 @@ def export_icons():
         # name without extensions
         name_only = file_name.replace('.svg', '')
 
-        out_icon_names = [name_only] # export to a png with the same file name
+        out_icon_names = [name_only]  # export to a png with the same file name
         theme_out_icon_names = []
         # special cases
         if special_icons.has_key(name_only):
@@ -82,7 +82,7 @@ def export_theme():
         # name without extensions
         name_only = file_name.replace('.svg', '')
 
-        out_icon_names = [name_only] # export to a png with the same file name
+        out_icon_names = [name_only]  # export to a png with the same file name
         # special cases
         if theme_icons.has_key(name_only):
             special_icon = theme_icons[name_only]
@@ -102,30 +102,30 @@ special_icons = {
         output_names=['icon_add'],
         theme_output_names=['icon_add', 'icon_zoom_more']
     ),
-    'icon_new': dict( output_names=['icon_file'] ),
-    'icon_animation_tree_player': dict( output_names=['icon_animation_tree'] ),
+    'icon_new': dict(output_names=['icon_file']),
+    'icon_animation_tree_player': dict(output_names=['icon_animation_tree']),
     'icon_tool_rotate': dict(
         output_names=['icon_reload'],
-        theme_output_names= ['icon_reload']
+        theme_output_names=['icon_reload']
     ),
-    'icon_multi_edit': dict( output_names=['icon_multi_node_edit'] ),
+    'icon_multi_edit': dict(output_names=['icon_multi_node_edit']),
     'icon_folder': dict(
         output_names=['icon_load', 'icon_open'],
-        theme_output_names= ['icon_folder']
+        theme_output_names=['icon_folder']
     ),
-    'icon_file_list': dict( output_names=['icon_enum'] ),
-    'icon_collision_2d': dict( output_names=['icon_collision_polygon_2d', 'icon_polygon_2d'] ),
-    'icon_class_list': dict( output_names=['icon_filesystem'] ),
-    'icon_color_ramp': dict( output_names=['icon_graph_color_ramp'] ),
-    'icon_translation': dict( output_names=['icon_p_hash_translation'] ),
-    'icon_shader': dict( output_names=['icon_shader_material', 'icon_material_shader'] ),
-    'icon_canvas_item_shader_graph': dict( output_names=['icon_material_shader_graph'] ),
-
-    'icon_color_pick': dict( theme_output_names= ['icon_color_pick'], avoid_self=True ),
-    'icon_play': dict( theme_output_names= ['icon_play'] ),
-    'icon_stop': dict( theme_output_names= ['icon_stop'] ),
-    'icon_zoom_less': dict( theme_output_names= ['icon_zoom_less'], avoid_self=True ),
-    'icon_zoom_reset': dict( theme_output_names= ['icon_zoom_reset'], avoid_self=True ),
+    'icon_file_list': dict(output_names=['icon_enum']),
+    'icon_collision_2d': dict(output_names=['icon_collision_polygon_2d', 'icon_polygon_2d']),
+    'icon_class_list': dict(output_names=['icon_filesystem']),
+    'icon_color_ramp': dict(output_names=['icon_graph_color_ramp']),
+    'icon_translation': dict(output_names=['icon_p_hash_translation']),
+    'icon_shader': dict(output_names=['icon_shader_material', 'icon_material_shader']),
+    'icon_canvas_item_shader_graph': dict(output_names=['icon_material_shader_graph']),
+
+    'icon_color_pick': dict(theme_output_names=['icon_color_pick'], avoid_self=True),
+    'icon_play': dict(theme_output_names=['icon_play']),
+    'icon_stop': dict(theme_output_names=['icon_stop']),
+    'icon_zoom_less': dict(theme_output_names=['icon_zoom_less'], avoid_self=True),
+    'icon_zoom_reset': dict(theme_output_names=['icon_zoom_reset'], avoid_self=True),
     'icon_snap': dict(theme_output_names=['icon_snap'])
 }
 

tools/translations/extract.py

@@ -78,7 +78,7 @@ for fname in matches:
                 msg += l[pos]
                 pos += 1
 
-            location = os.path.relpath(fname).replace('\\','/')
+            location = os.path.relpath(fname).replace('\\', '/')
             if (line_nb):
                 location += ":" + str(lc)
 
@@ -115,7 +115,7 @@ shutil.move("tools.pot", "tools/translations/tools.pot")
 
 # TODO: Make that in a portable way, if we care; if not, kudos to Unix users
 if (os.name == "posix"):
-    added = subprocess.check_output("git diff tools/translations/tools.pot | grep \+msgid | wc -l", shell = True)
-    removed = subprocess.check_output("git diff tools/translations/tools.pot | grep \\\-msgid | wc -l", shell = True)
+    added = subprocess.check_output("git diff tools/translations/tools.pot | grep \+msgid | wc -l", shell=True)
+    removed = subprocess.check_output("git diff tools/translations/tools.pot | grep \\\-msgid | wc -l", shell=True)
     print("\n# Template changes compared to the staged status:")
     print("#   Additions: %s msgids.\n#   Deletions: %s msgids." % (int(added), int(removed)))

version.py

-short_name="godot"
-name="Godot Engine"
-major=2
-minor=2
-status="alpha"
+short_name = "godot"
+name = "Godot Engine"
+major = 2
+minor = 2
+status = "alpha"