From ef9570c315ee0db1dffbb950dbd46aa726e06f83 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sat, 27 Apr 2019 07:31:15 -0700 Subject: add yapf style and apply yapf to format all Python files This recreates pull request #2192 --- .../Serialize/HeaderGenerator/blenderGenerate.py | 74 ++++++++++------------ Extras/Serialize/HeaderGenerator/bulletGenerate.py | 51 ++++++++------- 2 files changed, 60 insertions(+), 65 deletions(-) (limited to 'Extras') diff --git a/Extras/Serialize/HeaderGenerator/blenderGenerate.py b/Extras/Serialize/HeaderGenerator/blenderGenerate.py index e615fcc28..63c41804e 100644 --- a/Extras/Serialize/HeaderGenerator/blenderGenerate.py +++ b/Extras/Serialize/HeaderGenerator/blenderGenerate.py @@ -1,6 +1,5 @@ import dump - header = """/* Copyright (C) 2006 Charlie C * * This software is provided 'as-is', without any express or implied @@ -27,27 +26,30 @@ dtList = dump.DataTypeList out = "../BlenderSerialize/autogenerated/" spaces = 4 + def addSpaces(file, space): - for i in range(0, space): - file.write(" ") + for i in range(0, space): + file.write(" ") + def write(file, spaces, string): - addSpaces(file, spaces) - file.write(string) + addSpaces(file, spaces) + file.write(string) + ################################################################################### -blender = open(out+"blender.h", 'w') +blender = open(out + "blender.h", 'w') blender.write(header) blender.write("#ifndef __BLENDER_H__\n") blender.write("#define __BLENDER_H__\n") for dt in dtList: - blender.write("#include \"%s.h\"\n"%dt.filename) + blender.write("#include \"%s.h\"\n" % dt.filename) blender.write("#endif//__BLENDER_H__") blender.close() ################################################################################### -blenderC = open(out+"blender_Common.h", 'w') +blenderC = open(out + "blender_Common.h", 'w') blenderC.write(header) blenderC.write("#ifndef __BLENDERCOMMON_H__\n") blenderC.write("#define __BLENDERCOMMON_H__\n") @@ -63,49 +65,43 @@ blenderC.write(strUnRes) blenderC.write("namespace Blender {\n") for dt in dtList: - write(blenderC, 4, "class %s;\n"%dt.name) + write(blenderC, 4, "class %s;\n" % dt.name) blenderC.write("}\n") blenderC.write("#endif//__BLENDERCOMMON_H__") blenderC.close() - for dt in dtList: - fp = open(out+dt.filename+".h", 'w') - - fp.write(header) - strUpper = dt.filename.upper() - - fp.write("#ifndef __%s__H__\n"%strUpper) - fp.write("#define __%s__H__\n"%strUpper) - fp.write("\n\n") - - - fp.write("// -------------------------------------------------- //\n") - fp.write("#include \"blender_Common.h\"\n") + fp = open(out + dt.filename + ".h", 'w') - for i in dt.includes: - fp.write("#include \"%s\"\n"%i) + fp.write(header) + strUpper = dt.filename.upper() - fp.write("\nnamespace Blender {\n") - fp.write("\n\n") + fp.write("#ifndef __%s__H__\n" % strUpper) + fp.write("#define __%s__H__\n" % strUpper) + fp.write("\n\n") - addSpaces(fp,4) - fp.write("// ---------------------------------------------- //\n") + fp.write("// -------------------------------------------------- //\n") + fp.write("#include \"blender_Common.h\"\n") + for i in dt.includes: + fp.write("#include \"%s\"\n" % i) - write(fp, 4, "class %s\n"%dt.name) + fp.write("\nnamespace Blender {\n") + fp.write("\n\n") - write(fp, 4, "{\n") - write(fp, 4, "public:\n") - for i in dt.dataTypes: - write(fp, 8, i+";\n") + addSpaces(fp, 4) + fp.write("// ---------------------------------------------- //\n") + write(fp, 4, "class %s\n" % dt.name) - write(fp, 4, "};\n") - fp.write("}\n") - fp.write("\n\n") - fp.write("#endif//__%s__H__\n"%strUpper) - fp.close() + write(fp, 4, "{\n") + write(fp, 4, "public:\n") + for i in dt.dataTypes: + write(fp, 8, i + ";\n") - \ No newline at end of file + write(fp, 4, "};\n") + fp.write("}\n") + fp.write("\n\n") + fp.write("#endif//__%s__H__\n" % strUpper) + fp.close() diff --git a/Extras/Serialize/HeaderGenerator/bulletGenerate.py b/Extras/Serialize/HeaderGenerator/bulletGenerate.py index 90d616c56..5f1515d72 100644 --- a/Extras/Serialize/HeaderGenerator/bulletGenerate.py +++ b/Extras/Serialize/HeaderGenerator/bulletGenerate.py @@ -2,8 +2,6 @@ import sys sys.path.append(".") import dump - - header = """/* Copyright (C) 2011 Erwin Coumans & Charlie C * * This software is provided 'as-is', without any express or implied @@ -30,23 +28,25 @@ dtList = dump.DataTypeList out = "autogenerated/" spaces = 4 + def addSpaces(file, space): - for i in range(0, space): - file.write(" ") + for i in range(0, space): + file.write(" ") + def write(file, spaces, string): - addSpaces(file, spaces) - file.write(string) + addSpaces(file, spaces) + file.write(string) + ################################################################################### -blender = open(out+"bullet.h", 'w') +blender = open(out + "bullet.h", 'w') blender.write(header) blender.write("#ifndef __BULLET_H__\n") blender.write("#define __BULLET_H__\n") #for dt in dtList: # blender.write("struct %s;\n"%dt.filename) - ################################################################################### blender.write("namespace Bullet {\n") @@ -61,26 +61,25 @@ typedef struct bInvalidHandle { blender.write(strUnRes) for dt in dtList: - write(blender, 4, "class %s;\n"%dt.name) - + write(blender, 4, "class %s;\n" % dt.name) for dt in dtList: - - strUpper = dt.filename.upper() - - blender.write("// -------------------------------------------------- //\n") - - write(blender, 4, "class %s\n"%dt.name) - - write(blender, 4, "{\n") - write(blender, 4, "public:\n") - for i in dt.dataTypes: - write(blender, 8, i+";\n") - - write(blender, 4, "};\n") - - blender.write("\n\n") - + + strUpper = dt.filename.upper() + + blender.write("// -------------------------------------------------- //\n") + + write(blender, 4, "class %s\n" % dt.name) + + write(blender, 4, "{\n") + write(blender, 4, "public:\n") + for i in dt.dataTypes: + write(blender, 8, i + ";\n") + + write(blender, 4, "};\n") + + blender.write("\n\n") + blender.write("}\n") blender.write("#endif//__BULLET_H__") blender.close() -- cgit v1.2.1