From 8f5112f191e24aac86da7b70f461a50825e764da Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 20 Sep 2011 18:29:19 +0000 Subject: [PATCH] pep8 update & some minor cmake edits. --- build_files/buildbot/master_unpack.py | 2 +- build_files/cmake/cmake_static_check_cppcheck.py | 7 ++++--- build_files/cmake/cmake_static_check_splint.py | 4 ++-- build_files/cmake/project_source_info.py | 7 +------ doc/python_api/sphinx_doc_gen.py | 2 +- intern/audaspace/CMakeLists.txt | 2 ++ release/scripts/startup/bl_ui/properties_animviz.py | 1 + .../startup/bl_ui/properties_data_armature.py | 1 + .../scripts/startup/bl_ui/properties_data_bone.py | 1 + .../scripts/startup/bl_ui/properties_data_camera.py | 1 + .../scripts/startup/bl_ui/properties_data_curve.py | 1 + .../scripts/startup/bl_ui/properties_data_empty.py | 1 + .../scripts/startup/bl_ui/properties_data_lamp.py | 1 + .../scripts/startup/bl_ui/properties_data_mesh.py | 1 + .../startup/bl_ui/properties_data_metaball.py | 1 + .../startup/bl_ui/properties_data_modifier.py | 3 ++- release/scripts/startup/bl_ui/properties_game.py | 1 + release/scripts/startup/bl_ui/properties_material.py | 10 ++++++---- release/scripts/startup/bl_ui/properties_object.py | 1 + .../startup/bl_ui/properties_object_constraint.py | 3 ++- .../startup/bl_ui/properties_physics_common.py | 1 + .../startup/bl_ui/properties_physics_fluid.py | 3 ++- release/scripts/startup/bl_ui/properties_scene.py | 1 + release/scripts/startup/bl_ui/space_sequencer.py | 12 ++++++------ release/scripts/startup/bl_ui/space_text.py | 4 ++-- release/scripts/startup/bl_ui/space_userpref.py | 2 +- .../scripts/startup/bl_ui/space_userpref_keymap.py | 2 +- source/blender/editors/space_logic/CMakeLists.txt | 2 +- source/tests/bl_load_py_modules.py | 1 - 29 files changed, 47 insertions(+), 32 deletions(-) diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py index ad7c09933c6..cb63c1d3ffc 100644 --- a/build_files/buildbot/master_unpack.py +++ b/build_files/buildbot/master_unpack.py @@ -52,7 +52,7 @@ def get_platform(filename): platform_tokens = [] found = False - for i, token in enumerate(tokens): + for token in tokens: if not found: for platform in platforms: if platform in token.lower(): diff --git a/build_files/cmake/cmake_static_check_cppcheck.py b/build_files/cmake/cmake_static_check_cppcheck.py index f6d46904794..6eb9d4da8b6 100644 --- a/build_files/cmake/cmake_static_check_cppcheck.py +++ b/build_files/cmake/cmake_static_check_cppcheck.py @@ -43,6 +43,7 @@ CHECKER_ARGS = [ # "--enable=all", # if you want sixty hundred pedantic suggestions ] + def main(): source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX) @@ -58,12 +59,12 @@ def main(): check_commands.append((c, cmd)) for i, (c, cmd) in enumerate(check_commands): - percent = 100.0 * (i / (len(check_commands)-1)) + percent = 100.0 * (i / (len(check_commands) - 1)) percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:" - + # if percent < 27.9: # continue - + # let cppcheck finish the line off... sys.stdout.write("%s " % percent_str) diff --git a/build_files/cmake/cmake_static_check_splint.py b/build_files/cmake/cmake_static_check_splint.py index 3614ab48cf8..aa13ef82e3c 100644 --- a/build_files/cmake/cmake_static_check_splint.py +++ b/build_files/cmake/cmake_static_check_splint.py @@ -58,9 +58,9 @@ CHECKER_ARGS = [ # re-definitions, rna causes most of these "-redef", "-syntax", - + # dummy, witjout this splint complains with: - # /usr/include/bits/confname.h:31:27: *** Internal Bug at cscannerHelp.c:2428: Unexpanded macro not function or constant: int _PC_MAX_CANON + # /usr/include/bits/confname.h:31:27: *** Internal Bug at cscannerHelp.c:2428: Unexpanded macro not function or constant: int _PC_MAX_CANON "-D_PC_MAX_CANON=0", ] diff --git a/build_files/cmake/project_source_info.py b/build_files/cmake/project_source_info.py index c4b83d20ea5..670befbf2aa 100644 --- a/build_files/cmake/project_source_info.py +++ b/build_files/cmake/project_source_info.py @@ -27,7 +27,6 @@ __all__ = ( ) import os -import sys from os.path import join, dirname, normpath, abspath SOURCE_DIR = join(dirname(__file__), "..", "..") @@ -35,11 +34,6 @@ SOURCE_DIR = normpath(SOURCE_DIR) SOURCE_DIR = abspath(SOURCE_DIR) -def is_c_header(filename): - ext = os.path.splitext(filename)[1] - return (ext in (".h", ".hpp", ".hxx")) - - def is_c_header(filename): ext = os.path.splitext(filename)[1] return (ext in (".h", ".hpp", ".hxx")) @@ -79,6 +73,7 @@ def do_ignore(filepath, ignore_prefix_list): def makefile_log(): import subprocess + import time # Check blender is not 2.5x until it supports playback again print("running make with --dry-run ...") process = subprocess.Popen(["make", "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"], diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py index 1792cb00210..ca37030074a 100644 --- a/doc/python_api/sphinx_doc_gen.py +++ b/doc/python_api/sphinx_doc_gen.py @@ -765,7 +765,7 @@ def pyrna2sphinx(BASEPATH): fw(" .. attribute:: %s\n\n" % prop.identifier) if prop.description: fw(" %s\n\n" % prop.description) - + # special exception, cant use genric code here for enums if prop.type == "enum": enum_text = pyrna_enum2sphinx(prop) diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt index 25510ebd2a5..b7571adf3d5 100644 --- a/intern/audaspace/CMakeLists.txt +++ b/intern/audaspace/CMakeLists.txt @@ -67,6 +67,7 @@ set(SRC FX/AUD_SuperposeFactory.cpp FX/AUD_SuperposeReader.cpp FX/AUD_VolumeFactory.cpp + intern/AUD_3DMath.h intern/AUD_AnimateableProperty.cpp intern/AUD_AnimateableProperty.h @@ -99,6 +100,7 @@ set(SRC intern/AUD_IWriter.h intern/AUD_JOSResampleFactory.cpp intern/AUD_JOSResampleFactory.h + intern/AUD_JOSResampleReaderCoeff.cpp intern/AUD_JOSResampleReader.cpp intern/AUD_JOSResampleReader.h intern/AUD_LinearResampleFactory.cpp diff --git a/release/scripts/startup/bl_ui/properties_animviz.py b/release/scripts/startup/bl_ui/properties_animviz.py index 499ea4c95d4..d75541feca0 100644 --- a/release/scripts/startup/bl_ui/properties_animviz.py +++ b/release/scripts/startup/bl_ui/properties_animviz.py @@ -25,6 +25,7 @@ # dont register these classes since they are only helpers. from blf import gettext as _ + class MotionPathButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index e5729a24b91..97783c09d4b 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -22,6 +22,7 @@ from bpy.types import Panel, Menu from rna_prop_ui import PropertyPanel from blf import gettext as _ + class ArmatureButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py index 2c9b31fd88d..54045cd7d6e 100644 --- a/release/scripts/startup/bl_ui/properties_data_bone.py +++ b/release/scripts/startup/bl_ui/properties_data_bone.py @@ -23,6 +23,7 @@ from bpy.types import Panel from rna_prop_ui import PropertyPanel from blf import gettext as _ + class BoneButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py index 0d79ec99789..6d6f4c27ddf 100644 --- a/release/scripts/startup/bl_ui/properties_data_camera.py +++ b/release/scripts/startup/bl_ui/properties_data_camera.py @@ -22,6 +22,7 @@ from bpy.types import Panel from rna_prop_ui import PropertyPanel from blf import gettext as _ + class CameraButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index 861359fbed4..47051194fc0 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -22,6 +22,7 @@ from bpy.types import Panel from rna_prop_ui import PropertyPanel from blf import gettext as _ + class CurveButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' diff --git a/release/scripts/startup/bl_ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py index b6fa6d8e839..fac6d8fcfb1 100644 --- a/release/scripts/startup/bl_ui/properties_data_empty.py +++ b/release/scripts/startup/bl_ui/properties_data_empty.py @@ -21,6 +21,7 @@ import bpy from bpy.types import Panel from blf import gettext as _ + class DataButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' diff --git a/release/scripts/startup/bl_ui/properties_data_lamp.py b/release/scripts/startup/bl_ui/properties_data_lamp.py index 93ed8ca369b..f488669b424 100644 --- a/release/scripts/startup/bl_ui/properties_data_lamp.py +++ b/release/scripts/startup/bl_ui/properties_data_lamp.py @@ -22,6 +22,7 @@ from bpy.types import Menu, Panel from rna_prop_ui import PropertyPanel from blf import gettext as _ + class LAMP_MT_sunsky_presets(Menu): bl_label = _("Sun & Sky Presets") preset_subdir = "sunsky" diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 37c91370979..82185b0b1b0 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -22,6 +22,7 @@ from bpy.types import Menu, Panel from rna_prop_ui import PropertyPanel from blf import gettext as _ + class MESH_MT_vertex_group_specials(Menu): bl_label = _("Vertex Group Specials") COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} diff --git a/release/scripts/startup/bl_ui/properties_data_metaball.py b/release/scripts/startup/bl_ui/properties_data_metaball.py index 693cb697544..dbb947e416c 100644 --- a/release/scripts/startup/bl_ui/properties_data_metaball.py +++ b/release/scripts/startup/bl_ui/properties_data_metaball.py @@ -22,6 +22,7 @@ from bpy.types import Panel from rna_prop_ui import PropertyPanel from blf import gettext as _ + class DataButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 32324411669..4719ae450f7 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -21,6 +21,7 @@ import bpy from bpy.types import Panel from blf import gettext as _ + class ModifierButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -203,7 +204,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): def DECIMATE(self, layout, ob, md): layout.prop(md, "ratio") - layout.label(text=_("Face Count")+": %s" % str(md.face_count)) + layout.label(text=_("Face Count") + ": %d" % md.face_count) def DISPLACE(self, layout, ob, md): split = layout.split() diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 95ae54c4597..efe50b6fe2b 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -21,6 +21,7 @@ import bpy from bpy.types import Panel from blf import gettext as _ + class PhysicsButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index 7b04c990c6a..3a1a4358979 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -22,6 +22,7 @@ from bpy.types import Menu, Panel from rna_prop_ui import PropertyPanel from blf import gettext as _ + def active_node_mat(mat): # TODO, 2.4x has a pipeline section, for 2.5 we need to communicate # which settings from node-materials are used @@ -618,7 +619,7 @@ class MATERIAL_PT_game_settings(MaterialButtonsPanel, bpy.types.Panel): @classmethod def poll(cls, context): - return context.material and (context.scene.render.engine in cls.COMPAT_ENGINES) + return context.material and (context.scene.render.engine in cls.COMPAT_ENGINES) def draw(self, context): layout = self.layout @@ -633,13 +634,14 @@ class MATERIAL_PT_game_settings(MaterialButtonsPanel, bpy.types.Panel): row.label(text="Alpha Blend:") row.label(text="Face Orientation:") row = layout.row() - row.prop(game,"alpha_blend",text="") - row.prop(game,"face_orientation",text="") + row.prop(game, "alpha_blend", text="") + row.prop(game, "face_orientation", text="") + class MATERIAL_PT_physics(MaterialButtonsPanel, bpy.types.Panel): bl_label = "Physics" COMPAT_ENGINES = {'BLENDER_GAME'} - + def draw_header(self, context): game = context.material.game_settings self.layout.prop(game, "physics", text="") diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index a099189eed6..89ffd4d3ed1 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -22,6 +22,7 @@ from bpy.types import Panel from rna_prop_ui import PropertyPanel from blf import gettext as _ + class ObjectButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' diff --git a/release/scripts/startup/bl_ui/properties_object_constraint.py b/release/scripts/startup/bl_ui/properties_object_constraint.py index e7385d3926b..7b48834eb79 100644 --- a/release/scripts/startup/bl_ui/properties_object_constraint.py +++ b/release/scripts/startup/bl_ui/properties_object_constraint.py @@ -21,6 +21,7 @@ import bpy from bpy.types import Panel from blf import gettext as _ + class ConstraintButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -754,7 +755,7 @@ class ConstraintButtonsPanel(): col.prop(con, "rotation_range", text=_("Pivot When")) def SCRIPT(self, context, layout, con): - layout.label( _("Blender 2.5 has no py-constraints") ) + layout.label(_("Blender 2.5 has no py-constraints")) class OBJECT_PT_constraints(ConstraintButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py index 20b76ec0a84..7ca97c20422 100644 --- a/release/scripts/startup/bl_ui/properties_physics_common.py +++ b/release/scripts/startup/bl_ui/properties_physics_common.py @@ -22,6 +22,7 @@ import bpy from bpy.types import Panel from blf import gettext as _ + class PhysicButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index c89d7ec9755..35c8466e685 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -21,6 +21,7 @@ import bpy from bpy.types import Panel from blf import gettext as _ + class PhysicButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -58,7 +59,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel): layout.active = fluid.use if fluid.type == 'DOMAIN': - layout.operator("fluid.bake", text=_("Bake (Req. Memory:")+" %s)" % fluid.memory_estimate, icon='MOD_FLUIDSIM') + layout.operator("fluid.bake", text=_("Bake (Req. Memory:") + " %s)" % fluid.memory_estimate, icon='MOD_FLUIDSIM') split = layout.split() col = split.column() diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index c82b4ac69dc..7efb9cb6dc3 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -22,6 +22,7 @@ from bpy.types import Operator, Panel from rna_prop_ui import PropertyPanel from blf import gettext as _ + class SceneButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index a9a5eae3179..65aac4ae62f 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -372,13 +372,13 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel, Panel): col = layout.column(align=True) row = col.row() - row.label(text=_("Final Length")+": %s" % bpy.utils.smpte_from_frame(strip.frame_final_duration)) + row.label(text=_("Final Length") + ": %s" % bpy.utils.smpte_from_frame(strip.frame_final_duration)) row = col.row() row.active = (frame_current >= strip.frame_start and frame_current <= strip.frame_start + strip.frame_duration) - row.label(text=_("Playhead")+": %d" % (frame_current - strip.frame_start)) + row.label(text=_("Playhead") + ": %d" % (frame_current - strip.frame_start)) - col.label(text=_("Frame Offset")+" %d:%d" % (strip.frame_offset_start, strip.frame_offset_end)) - col.label(text=_("Frame Still")+" %d:%d" % (strip.frame_still_start, strip.frame_still_end)) + col.label(text=_("Frame Offset") + " %d:%d" % (strip.frame_offset_start, strip.frame_offset_end)) + col.label(text=_("Frame Still") + " %d:%d" % (strip.frame_still_start, strip.frame_still_end)) elem = False @@ -388,7 +388,7 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel, Panel): elem = strip.elements[0] if elem and elem.orig_width > 0 and elem.orig_height > 0: - col.label(text=_("Orig Dim")+": %dx%d" % (elem.orig_width, elem.orig_height)) + col.label(text=_("Orig Dim") + ": %dx%d" % (elem.orig_width, elem.orig_height)) else: col.label(text=_("Orig Dim: None")) @@ -690,7 +690,7 @@ class SEQUENCER_PT_scene(SequencerButtonsPanel, Panel): if scene: sta = scene.frame_start end = scene.frame_end - layout.label(text=_("Original frame range")+": %d-%d (%d)" % (sta, end, end - sta + 1)) + layout.label(text=_("Original frame range") + ": %d-%d (%d)" % (sta, end, end - sta + 1)) class SEQUENCER_PT_filter(SequencerButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index cd72d42857b..23e68487aae 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -67,9 +67,9 @@ class TEXT_HT_header(Header): row = layout.row() if text.filepath: if text.is_dirty: - row.label(text=_("File")+": *%r " % text.filepath+_("(unsaved)")) + row.label(text=_("File") + ": *%r " % text.filepath + _("(unsaved)")) else: - row.label(text=_("File")+": %r" % text.filepath) + row.label(text=_("File") + ": %r" % text.filepath) else: row.label(text=_("Text: External") if text.library diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index d0e7ae5e609..a31d4791e72 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -650,7 +650,7 @@ class USERPREF_PT_theme(Panel): col = split.column() for i, ui in enumerate(theme.bone_color_sets): - col.label(text=_("Color Set")+" %d:" % (i + 1)) # i starts from 0 + col.label(text=_("Color Set") + " %d:" % (i + 1)) # i starts from 0 row = col.row() diff --git a/release/scripts/startup/bl_ui/space_userpref_keymap.py b/release/scripts/startup/bl_ui/space_userpref_keymap.py index f8d77a1604b..a0a614e4fb4 100644 --- a/release/scripts/startup/bl_ui/space_userpref_keymap.py +++ b/release/scripts/startup/bl_ui/space_userpref_keymap.py @@ -202,7 +202,7 @@ class InputKeyMapPanel: subcol = self.indented_layout(col, level + 1) subrow = subcol.row() subrow.prop(km, "show_expanded_items", text="", emboss=False) - subrow.label(text="%s " % _(km.name) + _("(Global)") ) + subrow.label(text="%s " % _(km.name) + _("(Global)")) else: km.show_expanded_items = True diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt index f4bb255e11f..c4f9f49c9a1 100644 --- a/source/blender/editors/space_logic/CMakeLists.txt +++ b/source/blender/editors/space_logic/CMakeLists.txt @@ -21,11 +21,11 @@ set(INC ../include + ../interface ../../blenfont ../../blenkernel ../../blenlib ../../blenloader - ../../editors/interface ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/tests/bl_load_py_modules.py b/source/tests/bl_load_py_modules.py index a88edd5f1fe..619cad67cb8 100644 --- a/source/tests/bl_load_py_modules.py +++ b/source/tests/bl_load_py_modules.py @@ -25,7 +25,6 @@ import addon_utils import sys import os -import imp def source_list(path, filename_check=None):