From 98e69124807b9a5e16b617c89347fc77072e9b38 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 19 Jun 2012 22:17:19 +0000 Subject: style cleanup --- release/datafiles/clkernelstoh.py | 6 +-- release/scripts/modules/addon_utils.py | 4 +- release/scripts/modules/animsys_refactor.py | 6 +-- release/scripts/modules/blend_render_info.py | 6 +-- release/scripts/modules/bpy/__init__.py | 6 +-- release/scripts/modules/bpy/ops.py | 4 +- release/scripts/modules/bpy/utils.py | 2 +- release/scripts/modules/bpy_extras/image_utils.py | 2 +- .../scripts/modules/bpy_extras/keyconfig_utils.py | 2 +- release/scripts/modules/bpy_extras/mesh_utils.py | 2 +- release/scripts/modules/bpyml_ui.py | 2 +- release/scripts/modules/console_shell.py | 2 +- release/scripts/modules/graphviz_export.py | 2 +- release/scripts/modules/rna_info.py | 12 +++--- release/scripts/modules/rna_xml.py | 2 +- release/scripts/modules/sys_info.py | 4 +- release/scripts/startup/bl_operators/anim.py | 2 +- release/scripts/startup/bl_operators/console.py | 2 +- release/scripts/startup/bl_operators/object.py | 11 +++--- release/scripts/startup/bl_operators/presets.py | 2 +- .../startup/bl_operators/uvcalc_smart_project.py | 4 +- release/scripts/startup/bl_operators/wm.py | 21 +++++------ .../scripts/startup/bl_ui/properties_data_bone.py | 6 +-- .../scripts/startup/bl_ui/properties_data_curve.py | 2 +- .../startup/bl_ui/properties_data_modifier.py | 4 +- release/scripts/startup/bl_ui/properties_object.py | 6 +-- release/scripts/startup/bl_ui/properties_render.py | 4 +- release/scripts/startup/bl_ui/properties_scene.py | 4 +- release/scripts/startup/bl_ui/space_clip.py | 43 +++++++++++++--------- release/scripts/startup/bl_ui/space_info.py | 14 +++---- release/scripts/startup/bl_ui/space_node.py | 7 ++-- release/scripts/startup/bl_ui/space_sequencer.py | 14 +++---- release/scripts/startup/bl_ui/space_userpref.py | 6 +-- release/scripts/startup/bl_ui/space_view3d.py | 4 +- .../scripts/startup/bl_ui/space_view3d_toolbar.py | 4 +- 35 files changed, 116 insertions(+), 108 deletions(-) (limited to 'release') diff --git a/release/datafiles/clkernelstoh.py b/release/datafiles/clkernelstoh.py index 8fb5d4e6bae..9c24c9e2d03 100755 --- a/release/datafiles/clkernelstoh.py +++ b/release/datafiles/clkernelstoh.py @@ -61,9 +61,9 @@ fpout.write("const char * clkernelstoh_%s = " % filename) lines = fpin.readlines() for line in lines: - fpout.write("\"") - fpout.write(line.rstrip()) - fpout.write("\\n\" \\\n") + fpout.write("\"") + fpout.write(line.rstrip()) + fpout.write("\\n\" \\\n") fpout.write("\"\\0\";\n") fpin.close() diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py index 695bb8cb6b6..f90c04eda02 100644 --- a/release/scripts/modules/addon_utils.py +++ b/release/scripts/modules/addon_utils.py @@ -183,8 +183,8 @@ def modules(module_cache): del modules_stale mod_list = list(module_cache.values()) - mod_list.sort(key=lambda mod: (mod.bl_info['category'], - mod.bl_info['name'], + mod_list.sort(key=lambda mod: (mod.bl_info["category"], + mod.bl_info["name"], )) return mod_list diff --git a/release/scripts/modules/animsys_refactor.py b/release/scripts/modules/animsys_refactor.py index 097a0296a8e..06c449afd41 100644 --- a/release/scripts/modules/animsys_refactor.py +++ b/release/scripts/modules/animsys_refactor.py @@ -887,9 +887,9 @@ if __name__ == "__main__": # Example, should be called externally # (class, from, to) replace_ls = [ - ('AnimVizMotionPaths', 'frame_after', 'frame_after'), - ('AnimVizMotionPaths', 'frame_before', 'frame_before'), - ('AnimVizOnionSkinning', 'frame_after', 'frame_after'), + ("AnimVizMotionPaths", "frame_after", "frame_after"), + ("AnimVizMotionPaths", "frame_before", "frame_before"), + ("AnimVizOnionSkinning", "frame_after", "frame_after"), ] update_data_paths(replace_ls) diff --git a/release/scripts/modules/blend_render_info.py b/release/scripts/modules/blend_render_info.py index 5a09f664637..8762ea0e287 100755 --- a/release/scripts/modules/blend_render_info.py +++ b/release/scripts/modules/blend_render_info.py @@ -36,14 +36,14 @@ def read_blend_rend_chunk(path): import struct - blendfile = open(path, 'rb') + blendfile = open(path, "rb") head = blendfile.read(7) if head[0:2] == b'\x1f\x8b': # gzip magic import gzip blendfile.close() - blendfile = gzip.open(path, 'rb') + blendfile = gzip.open(path, "rb") head = blendfile.read(7) if head != b'BLENDER': @@ -80,7 +80,7 @@ def read_blend_rend_chunk(path): scene_name = scene_name[:scene_name.index(b'\0')] try: - scene_name = str(scene_name, 'utf8') + scene_name = str(scene_name, "utf8") except TypeError: pass diff --git a/release/scripts/modules/bpy/__init__.py b/release/scripts/modules/bpy/__init__.py index 621484fc896..34b7a9ea7b6 100644 --- a/release/scripts/modules/bpy/__init__.py +++ b/release/scripts/modules/bpy/__init__.py @@ -63,11 +63,11 @@ def main(): #~ if "-d" in sys.argv: # Enable this to measure start up speed if 0: import cProfile - cProfile.run('import bpy; bpy.utils.load_scripts()', 'blender.prof') + cProfile.run("import bpy; bpy.utils.load_scripts()", "blender.prof") import pstats - p = pstats.Stats('blender.prof') - p.sort_stats('cumulative').print_stats(100) + p = pstats.Stats("blender.prof") + p.sort_stats("cumulative").print_stats(100) else: utils.load_scripts() diff --git a/release/scripts/modules/bpy/ops.py b/release/scripts/modules/bpy/ops.py index d01b706cc37..056fcdb519e 100644 --- a/release/scripts/modules/bpy/ops.py +++ b/release/scripts/modules/bpy/ops.py @@ -74,7 +74,7 @@ class BPyOpsSubMod(object): eg. bpy.ops.object ''' - __keys__ = ('module',) + __keys__ = ("module",) def __init__(self, module): self.module = module @@ -111,7 +111,7 @@ class BPyOpsSubModOp(object): eg. bpy.ops.object.somefunc ''' - __keys__ = ('module', 'func') + __keys__ = ("module", "func") def _get_doc(self): return op_as_string(self.idname()) diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index 4e8179775d5..da12975e4a6 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -489,7 +489,7 @@ def keyconfig_set(filepath): try: keyfile = open(filepath) - exec(compile(keyfile.read(), filepath, 'exec'), {"__file__": filepath}) + exec(compile(keyfile.read(), filepath, "exec"), {"__file__": filepath}) keyfile.close() except: import traceback diff --git a/release/scripts/modules/bpy_extras/image_utils.py b/release/scripts/modules/bpy_extras/image_utils.py index c21b750fd1f..36994d3fddd 100644 --- a/release/scripts/modules/bpy_extras/image_utils.py +++ b/release/scripts/modules/bpy_extras/image_utils.py @@ -71,7 +71,7 @@ def load_image(imagepath, def _image_load_placeholder(path): name = bpy.path.basename(path) if type(name) == bytes: - name = name.decode('utf-8', "replace") + name = name.decode("utf-8", "replace") image = bpy.data.images.new(name, 128, 128) # allow the path to be resolved later image.filepath = path diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py index f8b0abd03ea..dbff90c2447 100644 --- a/release/scripts/modules/bpy_extras/keyconfig_utils.py +++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py @@ -171,7 +171,7 @@ def keyconfig_export(wm, kc, filepath): # First add all user_modified keymaps (found in keyconfigs.user.keymaps list), # then add all remaining keymaps from the currently active custom keyconfig. # - # This will create a final list of keymaps that can be used as a 'diff' against + # This will create a final list of keymaps that can be used as a "diff" against # the default blender keyconfig, recreating the current setup from a fresh blender # without needing to export keymaps which haven't been edited. diff --git a/release/scripts/modules/bpy_extras/mesh_utils.py b/release/scripts/modules/bpy_extras/mesh_utils.py index 3ce45154765..fa83b1861d2 100644 --- a/release/scripts/modules/bpy_extras/mesh_utils.py +++ b/release/scripts/modules/bpy_extras/mesh_utils.py @@ -414,7 +414,7 @@ def ngon_tessellate(from_data, indices, fix_loops=True): fill = tessellate_polygon([[v[0] for v in loop] for loop in loop_list]) #draw_loops(loop_list) - #raise 'done loop' + #raise Exception("done loop") # map to original indices fill = [[vert_map[i] for i in reversed(f)] for f in fill] diff --git a/release/scripts/modules/bpyml_ui.py b/release/scripts/modules/bpyml_ui.py index 4828b3649d3..a7e2e7bc04a 100644 --- a/release/scripts/modules/bpyml_ui.py +++ b/release/scripts/modules/bpyml_ui.py @@ -73,7 +73,7 @@ def _call_recursive(context, base, py_node): value = eval(value, {"context": _bpy.context}) setattr(base, py_node[TAG], value) else: - value = py_node[ARGS]['value'] # have to have this + value = py_node[ARGS]["value"] # have to have this setattr(base, py_node[TAG], value) else: args = _parse_rna_args(base, py_node) diff --git a/release/scripts/modules/console_shell.py b/release/scripts/modules/console_shell.py index 772d46c8bf3..c27524ffe44 100644 --- a/release/scripts/modules/console_shell.py +++ b/release/scripts/modules/console_shell.py @@ -20,7 +20,7 @@ import os import bpy -language_id = 'shell' +language_id = "shell" def add_scrollback(text, text_type): diff --git a/release/scripts/modules/graphviz_export.py b/release/scripts/modules/graphviz_export.py index b60952a2f88..88f8b15a728 100644 --- a/release/scripts/modules/graphviz_export.py +++ b/release/scripts/modules/graphviz_export.py @@ -172,7 +172,7 @@ def graph_armature(obj, filepath, FAKE_PARENT=True, CONSTRAINTS=True, DRIVERS=Tr fileobject.close() ''' - print(".", end='') + print(".", end="") import sys sys.stdout.flush() ''' diff --git a/release/scripts/modules/rna_info.py b/release/scripts/modules/rna_info.py index 4116bfda0c7..7eccda74e14 100644 --- a/release/scripts/modules/rna_info.py +++ b/release/scripts/modules/rna_info.py @@ -66,9 +66,9 @@ def rna_id_ignore(rna_id): def range_str(val): if val < -10000000: - return '-inf' + return "-inf" elif val > 10000000: - return 'inf' + return "inf" elif type(val) == float: return '%g' % val else: @@ -305,8 +305,8 @@ class InfoPropertyRNA: return type_str def __str__(self): - txt = '' - txt += ' * ' + self.identifier + ': ' + self.description + txt = "" + txt += " * " + self.identifier + ": " + self.description return txt @@ -398,7 +398,7 @@ class InfoOperatorRNA: return None, None -def _GetInfoRNA(bl_rna, cls, parent_id=''): +def _GetInfoRNA(bl_rna, cls, parent_id=""): if bl_rna is None: return None @@ -641,7 +641,7 @@ if __name__ == "__main__": props = [(prop.identifier, prop) for prop in v.properties] for prop_id, prop in sorted(props): - # if prop.type == 'boolean': + # if prop.type == "boolean": # continue prop_type = prop.type if prop.array_length > 0: diff --git a/release/scripts/modules/rna_xml.py b/release/scripts/modules/rna_xml.py index 710035dc29f..5354fd1c776 100644 --- a/release/scripts/modules/rna_xml.py +++ b/release/scripts/modules/rna_xml.py @@ -352,7 +352,7 @@ def xml_file_run(context, filepath, rna_map): def xml_file_write(context, filepath, rna_map): - file = open(filepath, 'w', encoding='utf-8') + file = open(filepath, "w", encoding="utf-8") fw = file.write fw("\n") diff --git a/release/scripts/modules/sys_info.py b/release/scripts/modules/sys_info.py index 0fa80a8f855..6fc50bcfe0d 100644 --- a/release/scripts/modules/sys_info.py +++ b/release/scripts/modules/sys_info.py @@ -27,7 +27,7 @@ import sys def cutPoint(text, length): - "Returns position of the last space found before 'length' chars" + """Returns position of the last space found before 'length' chars""" l = length c = text[l] while c != ' ': @@ -98,7 +98,7 @@ def write_sysinfo(op): output.write(lilies) ffmpeg = bpy.app.ffmpeg if ffmpeg.supported: - for lib in ['avcodec', 'avdevice', 'avformat', 'avutil', 'swscale']: + for lib in ("avcodec", "avdevice", "avformat", "avutil", "swscale"): output.write("%r:%r%r\n" % (lib, " " * (10 - len(lib)), getattr(ffmpeg, lib + "_version_string"))) else: diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py index 5a428467f12..98bad276109 100644 --- a/release/scripts/startup/bl_operators/anim.py +++ b/release/scripts/startup/bl_operators/anim.py @@ -227,7 +227,7 @@ class BakeAction(Operator): self.frame_start = scene.frame_start self.frame_end = scene.frame_end self.bake_types = {'POSE'} if context.mode == 'POSE' else {'OBJECT'} - + wm = context.window_manager return wm.invoke_props_dialog(self) diff --git a/release/scripts/startup/bl_operators/console.py b/release/scripts/startup/bl_operators/console.py index ff87f98658d..82a54077bdc 100644 --- a/release/scripts/startup/bl_operators/console.py +++ b/release/scripts/startup/bl_operators/console.py @@ -77,7 +77,7 @@ class ConsoleBanner(Operator): # default to python if not sc.language: - sc.language = 'python' + sc.language = "python" module = _lang_module_get(sc) banner = getattr(module, "banner", None) diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index fbf0e47f0c8..a2c632a0244 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -34,7 +34,8 @@ class SelectPattern(Operator): pattern = StringProperty( name="Pattern", - description="Name filter using '*', '?' and '[abc]' unix style wildcards", + description="Name filter using '*', '?' and " + "'[abc]' unix style wildcards", maxlen=64, default="*", ) @@ -130,8 +131,8 @@ class SelectCamera(Operator): class SelectHierarchy(Operator): - '''Select object relative to the active object's position ''' \ - '''in the hierarchy''' + """Select object relative to the active object's position """ + """in the hierarchy""" bl_idname = "object.select_hierarchy" bl_label = "Select Hierarchy" bl_options = {'REGISTER', 'UNDO'} @@ -277,8 +278,8 @@ class SubdivisionSet(Operator): class ShapeTransfer(Operator): - '''Copy another selected objects active shape to this one by ''' \ - '''applying the relative offsets''' + """Copy another selected objects active shape to this one by """ + """applying the relative offsets""" bl_idname = "object.shape_key_transfer" bl_label = "Transfer Shape Key" diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index 4171b8b3c2c..bf5a57fb39a 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -16,7 +16,7 @@ # # ##### END GPL LICENSE BLOCK ##### -# +# import bpy from bpy.types import Menu, Operator diff --git a/release/scripts/startup/bl_operators/uvcalc_smart_project.py b/release/scripts/startup/bl_operators/uvcalc_smart_project.py index 1e18825a155..ac4aa96f655 100644 --- a/release/scripts/startup/bl_operators/uvcalc_smart_project.py +++ b/release/scripts/startup/bl_operators/uvcalc_smart_project.py @@ -107,7 +107,6 @@ def boundsEdgeLoop(edges): # print len(faces), minx, maxx, miny , maxy for ed in edges: for pt in ed: - print 'ass' x= pt[0] y= pt[1] if x