From 7095f4766593cc2b55669b032d7de0fa13fcb4c7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 29 Jan 2015 15:35:06 +1100 Subject: cleanup: pep8 also remove empty class parenthesis --- build_files/buildbot/master.cfg | 7 +++++-- build_files/buildbot/master_unpack.py | 4 +++- build_files/buildbot/slave_compile.py | 4 ++-- build_files/buildbot/slave_pack.py | 4 ++-- doc/python_api/examples/bpy.types.Panel.2.py | 2 +- doc/python_api/sphinx_changelog_gen.py | 2 +- intern/cycles/blender/addon/engine.py | 1 + intern/cycles/blender/addon/properties.py | 2 +- intern/cycles/blender/addon/ui.py | 2 +- .../modules/bl_i18n_utils/bl_extract_messages.py | 3 ++- release/scripts/modules/bl_i18n_utils/settings.py | 4 ++++ .../modules/bl_i18n_utils/utils_spell_check.py | 2 +- .../scripts/modules/bpy_extras/keyconfig_utils.py | 2 +- release/scripts/modules/bpy_restrict_state.py | 6 +++--- release/scripts/modules/bpyml_ui.py | 2 +- release/scripts/modules/nodeitems_utils.py | 6 +++--- release/scripts/modules/rna_prop_ui.py | 2 +- release/scripts/modules/rna_xml.py | 2 +- release/scripts/modules/sys_info.py | 2 +- release/scripts/startup/bl_operators/node.py | 2 +- release/scripts/startup/bl_operators/object.py | 2 +- release/scripts/startup/bl_operators/presets.py | 2 +- .../scripts/startup/bl_operators/vertexpaint_dirt.py | 2 -- release/scripts/startup/bl_operators/wm.py | 1 - release/scripts/startup/bl_ui/properties_animviz.py | 4 ++-- .../scripts/startup/bl_ui/properties_constraint.py | 2 +- .../startup/bl_ui/properties_data_armature.py | 4 ++-- .../scripts/startup/bl_ui/properties_data_bone.py | 2 +- .../scripts/startup/bl_ui/properties_data_camera.py | 10 +++++----- .../scripts/startup/bl_ui/properties_data_curve.py | 2 +- .../scripts/startup/bl_ui/properties_data_empty.py | 2 +- .../scripts/startup/bl_ui/properties_data_lamp.py | 2 +- .../scripts/startup/bl_ui/properties_data_lattice.py | 2 +- .../scripts/startup/bl_ui/properties_data_mesh.py | 2 +- .../startup/bl_ui/properties_data_metaball.py | 2 +- .../startup/bl_ui/properties_data_modifier.py | 2 +- .../scripts/startup/bl_ui/properties_data_speaker.py | 2 +- .../scripts/startup/bl_ui/properties_freestyle.py | 6 +++--- release/scripts/startup/bl_ui/properties_game.py | 12 ++++++------ .../startup/bl_ui/properties_grease_pencil_common.py | 20 ++++++++++---------- .../scripts/startup/bl_ui/properties_mask_common.py | 12 ++++++------ release/scripts/startup/bl_ui/properties_material.py | 4 ++-- release/scripts/startup/bl_ui/properties_object.py | 2 +- .../scripts/startup/bl_ui/properties_paint_common.py | 6 +++--- release/scripts/startup/bl_ui/properties_particle.py | 3 ++- .../startup/bl_ui/properties_physics_cloth.py | 2 +- .../startup/bl_ui/properties_physics_common.py | 2 +- .../startup/bl_ui/properties_physics_dynamicpaint.py | 2 +- .../startup/bl_ui/properties_physics_field.py | 2 +- .../startup/bl_ui/properties_physics_fluid.py | 2 +- .../startup/bl_ui/properties_physics_rigidbody.py | 2 +- .../bl_ui/properties_physics_rigidbody_constraint.py | 2 +- .../startup/bl_ui/properties_physics_smoke.py | 2 +- .../startup/bl_ui/properties_physics_softbody.py | 2 +- release/scripts/startup/bl_ui/properties_render.py | 2 +- .../scripts/startup/bl_ui/properties_render_layer.py | 2 +- release/scripts/startup/bl_ui/properties_scene.py | 6 +++--- release/scripts/startup/bl_ui/properties_texture.py | 6 +++--- release/scripts/startup/bl_ui/properties_world.py | 3 +-- release/scripts/startup/bl_ui/space_dopesheet.py | 1 - release/scripts/startup/bl_ui/space_image.py | 5 ++++- release/scripts/startup/bl_ui/space_node.py | 5 +++-- release/scripts/startup/bl_ui/space_sequencer.py | 12 ++++++------ release/scripts/startup/bl_ui/space_view3d.py | 3 ++- .../scripts/startup/bl_ui/space_view3d_toolbar.py | 12 ++++++------ source/blender/datatoc/datatoc_icon_split.py | 2 +- tests/python/pep8.py | 12 +++++++++++- 67 files changed, 141 insertions(+), 119 deletions(-) diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index e96f49bdb5f..d7f56781f38 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -4,10 +4,10 @@ # # List of the branches being built automatically overnight -NIGHT_SCHEDULE_BRANCHES=[None, "gooseberry"] +NIGHT_SCHEDULE_BRANCHES = [None, "gooseberry"] # List of the branches available for force build -FORCE_SCHEDULE_BRANCHES=["master", "gooseberry", "experimental-build"] +FORCE_SCHEDULE_BRANCHES = ["master", "gooseberry", "experimental-build"] """ Stock Twisted directory lister doesn't provide any information about last file @@ -17,6 +17,7 @@ modification time, we hack the class a bit in order to have such functionaliity from buildbot.status.web.base import DirectoryLister + def get_files_and_directories(self, directory): from twisted.web.static import (getTypeAndEncoding, formatFileSize) @@ -97,6 +98,7 @@ all_repositories = { r'https://svn.blender.org/svnroot/bf-blender/': 'lib svn', } + def codebaseGenerator(chdict): return all_repositories[chdict['repository']] @@ -112,6 +114,7 @@ from buildbot.schedulers import timed, forcesched c['schedulers'] = [] + def schedule_force_build(name): c['schedulers'].append(forcesched.ForceScheduler(name='force ' + name, builderNames=[name], diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py index 56ab80dc87f..46131c5e1de 100644 --- a/build_files/buildbot/master_unpack.py +++ b/build_files/buildbot/master_unpack.py @@ -37,6 +37,7 @@ def strip_extension(filename): return filename + # extract platform from package name def get_platform(filename): # name is blender-version-platform.extension. we want to get the @@ -64,10 +65,11 @@ def get_platform(filename): return '-'.join(platform_tokens) + def get_branch(filename): tokens = filename.split("-") branch = "" - + for token in tokens: if token == "blender": return branch diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 4ef46331c64..cbe345e764c 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -47,9 +47,9 @@ if 'cmake' in builder: cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=ppc') if 'win64' in builder: - cmake_options.append(['-G','"Visual Studio 12 2013 Win64"']) + cmake_options.append(['-G', '"Visual Studio 12 2013 Win64"']) elif 'win32' in builder: - cmake_options.append(['-G','"Visual Studio 12 2013"']) + cmake_options.append(['-G', '"Visual Studio 12 2013"']) cmake_options.append("-C../blender.git/build_files/cmake/config/blender_full.cmake") cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=1") diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 8959e0e06f9..4e5d77b2a0a 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -116,12 +116,12 @@ if builder.find('scons') != -1: retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options) sys.exit(retcode) else: -#cmake + # CMake if 'win' in builder: files = [f for f in os.listdir('.') if os.path.isfile(f) and f.endswith('.zip')] for f in files: os.remove(f) - retcode = subprocess.call(['cpack', '-G','ZIP']) + retcode = subprocess.call(['cpack', '-G', 'ZIP']) result_file = [f for f in os.listdir('.') if os.path.isfile(f) and f.endswith('.zip')][0] os.rename(result_file, "{}.zip".format(builder)) # create zip file diff --git a/doc/python_api/examples/bpy.types.Panel.2.py b/doc/python_api/examples/bpy.types.Panel.2.py index a4b2f1fd338..261430f1396 100644 --- a/doc/python_api/examples/bpy.types.Panel.2.py +++ b/doc/python_api/examples/bpy.types.Panel.2.py @@ -7,7 +7,7 @@ A mix-in parent class can be used to share common properties and import bpy -class View3DPanel(): +class View3DPanel: bl_space_type = 'VIEW_3D' bl_region_type = 'TOOLS' diff --git a/doc/python_api/sphinx_changelog_gen.py b/doc/python_api/sphinx_changelog_gen.py index 3b968de9a2c..0b083c31c58 100644 --- a/doc/python_api/sphinx_changelog_gen.py +++ b/doc/python_api/sphinx_changelog_gen.py @@ -316,7 +316,7 @@ def main(): try: import argparse - except: + except ImportError: print("Old Blender, just dumping") api_dump() return diff --git a/intern/cycles/blender/addon/engine.py b/intern/cycles/blender/addon/engine.py index a0ad044f24c..e1d82db25e1 100644 --- a/intern/cycles/blender/addon/engine.py +++ b/intern/cycles/blender/addon/engine.py @@ -101,6 +101,7 @@ def with_network(): import _cycles return _cycles.with_network + def system_info(): import _cycles return _cycles.system_info() diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 5f8a55d3de8..4b841466df7 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -481,7 +481,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): name="Bake Type", default='COMBINED', description="Type of pass to bake", - items = ( + items=( ('COMBINED', "Combined", ""), ('AO', "Ambient Occlusion", ""), ('SHADOW', "Shadow", ""), diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index da303ce5690..651114a12dc 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -37,7 +37,7 @@ class CYCLES_MT_integrator_presets(Menu): draw = Menu.draw_preset -class CyclesButtonsPanel(): +class CyclesButtonsPanel: bl_space_type = "PROPERTIES" bl_region_type = "WINDOW" bl_context = "render" diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py index 835d1fc5195..d434c6a79cd 100644 --- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -62,6 +62,7 @@ def _gen_check_ctxt(settings): "spell_errors": {}, } + def _diff_check_ctxt(check_ctxt, minus_check_ctxt): """Returns check_ctxt - minus_check_ctxt""" for key in check_ctxt: @@ -74,6 +75,7 @@ def _diff_check_ctxt(check_ctxt, minus_check_ctxt): if warning in check_ctxt[key]: del check_ctxt[key][warning] + def _gen_reports(check_ctxt): return { "check_ctxt": check_ctxt, @@ -473,7 +475,6 @@ def dump_py_messages_from_files(msgs, reports, files, settings): return [_extract_string_merge(estr_ls, nds_ls) for estr_ls, nds_ls in bag] - i18n_ctxt_ids = {v for v in bpy.app.translations.contexts_C_to_py.values()} def _ctxt_to_ctxt(node): # We must try, to some extend, to get contexts from vars instead of only literal strings... diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py index 300cd7ae955..0e08731c658 100644 --- a/release/scripts/modules/bl_i18n_utils/settings.py +++ b/release/scripts/modules/bl_i18n_utils/settings.py @@ -473,6 +473,7 @@ for p in set(INTERN_PY_SYS_PATHS.split(";")): def _do_get(ref, path): return os.path.normpath(os.path.join(ref, path)) + def _do_set(ref, path): path = os.path.normpath(path) # If given path is absolute, make it relative to current ref one (else we consider it is already the case!) @@ -484,6 +485,7 @@ def _do_set(ref, path): pass return path + def _gen_get_set_path(ref, name): def _get(self): return _do_get(getattr(self, ref), getattr(self, name)) @@ -491,6 +493,7 @@ def _gen_get_set_path(ref, name): setattr(self, name, _do_set(getattr(self, ref), value)) return _get, _set + def _gen_get_set_paths(ref, name): def _get(self): return [_do_get(getattr(self, ref), p) for p in getattr(self, name)] @@ -498,6 +501,7 @@ def _gen_get_set_paths(ref, name): setattr(self, name, [_do_set(getattr(self, ref), p) for p in value]) return _get, _set + class I18nSettings: """ Class allowing persistence of our settings! diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py index b77c636640a..ee83c6cc3c9 100644 --- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -24,7 +24,7 @@ import pickle import re -class SpellChecker(): +class SpellChecker: """ A basic spell checker. """ diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py index 3f5a23683ee..abc613bfa14 100644 --- a/release/scripts/modules/bpy_extras/keyconfig_utils.py +++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py @@ -245,7 +245,7 @@ def keyconfig_export(wm, kc, filepath): # the default blender keyconfig, recreating the current setup from a fresh blender # without needing to export keymaps which haven't been edited. - class FakeKeyConfig(): + class FakeKeyConfig: keymaps = [] edited_kc = FakeKeyConfig() for km in wm.keyconfigs.user.keymaps: diff --git a/release/scripts/modules/bpy_restrict_state.py b/release/scripts/modules/bpy_restrict_state.py index 4aa3c5de573..4658fddf0dc 100644 --- a/release/scripts/modules/bpy_restrict_state.py +++ b/release/scripts/modules/bpy_restrict_state.py @@ -29,7 +29,7 @@ __all__ = ( import bpy as _bpy -class _RestrictContext(): +class _RestrictContext: __slots__ = () _real_data = _bpy.data # safe, the pointer never changes @@ -44,7 +44,7 @@ class _RestrictContext(): return self._real_pref -class _RestrictData(): +class _RestrictData: __slots__ = () @@ -52,7 +52,7 @@ _context_restrict = _RestrictContext() _data_restrict = _RestrictData() -class RestrictBlend(): +class RestrictBlend: __slots__ = ("context", "data") def __enter__(self): diff --git a/release/scripts/modules/bpyml_ui.py b/release/scripts/modules/bpyml_ui.py index b4ad4e0b54a..dd5fc38d0eb 100644 --- a/release/scripts/modules/bpyml_ui.py +++ b/release/scripts/modules/bpyml_ui.py @@ -84,7 +84,7 @@ def _call_recursive(context, base, py_node): _call_recursive(context, base_new, py_node_child) -class BPyML_BaseUI(): +class BPyML_BaseUI: """ This is a mix-in class that defines a draw function which checks for draw_data diff --git a/release/scripts/modules/nodeitems_utils.py b/release/scripts/modules/nodeitems_utils.py index 1fef6c3a019..2882a08fbd4 100644 --- a/release/scripts/modules/nodeitems_utils.py +++ b/release/scripts/modules/nodeitems_utils.py @@ -20,7 +20,7 @@ import bpy -class NodeCategory(): +class NodeCategory: @classmethod def poll(cls, context): return True @@ -42,7 +42,7 @@ class NodeCategory(): self.items = items_gen -class NodeItem(): +class NodeItem: def __init__(self, nodetype, label=None, settings={}, poll=None): self.nodetype = nodetype self._label = label @@ -73,7 +73,7 @@ class NodeItem(): ops.value = setting[1] -class NodeItemCustom(): +class NodeItemCustom: def __init__(self, poll=None, draw=None): self.poll = poll self.draw = draw diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py index e278b0d20fe..f4649453b46 100644 --- a/release/scripts/modules/rna_prop_ui.py +++ b/release/scripts/modules/rna_prop_ui.py @@ -168,7 +168,7 @@ def draw(layout, context, context_member, property_type, use_edit=True): assign_props(props, val_draw, key) -class PropertyPanel(): +class PropertyPanel: """ The subclass should have its own poll function and the variable '_context_path' MUST be set. diff --git a/release/scripts/modules/rna_xml.py b/release/scripts/modules/rna_xml.py index 41f890de51f..729d6238ac3 100644 --- a/release/scripts/modules/rna_xml.py +++ b/release/scripts/modules/rna_xml.py @@ -331,7 +331,7 @@ def xml2rna(root_xml, rna2xml_node(child_xml_real, subsubvalue) else: -# print(elems) + # print(elems) if len(elems) == 1: # sub node named by its type diff --git a/release/scripts/modules/sys_info.py b/release/scripts/modules/sys_info.py index cecb2a767ef..74a6f4c36e8 100644 --- a/release/scripts/modules/sys_info.py +++ b/release/scripts/modules/sys_info.py @@ -153,7 +153,7 @@ def write_sysinfo(op): else: output.write("\nOpenGL\n") output.write(lilies) - version = bgl.glGetString(bgl.GL_RENDERER); + version = bgl.glGetString(bgl.GL_RENDERER) output.write("renderer:\t%r\n" % version) output.write("vendor:\t\t%r\n" % (bgl.glGetString(bgl.GL_VENDOR))) output.write("version:\t%r\n" % (bgl.glGetString(bgl.GL_VERSION))) diff --git a/release/scripts/startup/bl_operators/node.py b/release/scripts/startup/bl_operators/node.py index 264cfa34992..f660f775c5c 100644 --- a/release/scripts/startup/bl_operators/node.py +++ b/release/scripts/startup/bl_operators/node.py @@ -42,7 +42,7 @@ class NodeSetting(PropertyGroup): # Base class for node 'Add' operators -class NodeAddOperator(): +class NodeAddOperator: type = StringProperty( name="Node Type", diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index 1f8c89b2fd9..e3ceeca8abe 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -252,7 +252,7 @@ class SubdivisionSet(Operator): if not relative: if level > mod.total_levels: sub = level - mod.total_levels - for i in range (0, sub): + for i in range(sub): bpy.ops.object.multires_subdivide(modifier="Multires") if obj.mode == 'SCULPT': diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index bb6b3a5a7c0..7195b7819d1 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -23,7 +23,7 @@ from bpy.types import Menu, Operator from bpy.props import StringProperty, BoolProperty -class AddPresetBase(): +class AddPresetBase: """Base preset class, only for subclassing subclasses must define - preset_values diff --git a/release/scripts/startup/bl_operators/vertexpaint_dirt.py b/release/scripts/startup/bl_operators/vertexpaint_dirt.py index e0d2da2a027..892e1822d68 100644 --- a/release/scripts/startup/bl_operators/vertexpaint_dirt.py +++ b/release/scripts/startup/bl_operators/vertexpaint_dirt.py @@ -176,8 +176,6 @@ class VertexPaintDirt(Operator): return (obj and obj.type == 'MESH') def execute(self, context): - import time - obj = context.object mesh = obj.data diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index 53bf52498b1..a48415caa9b 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1988,7 +1988,6 @@ class WM_OT_addon_install(Operator): # if not compressed file just copy into the addon path try: shutil.copyfile(pyfile, path_dest) - except: traceback.print_exc() return {'CANCELLED'} diff --git a/release/scripts/startup/bl_ui/properties_animviz.py b/release/scripts/startup/bl_ui/properties_animviz.py index 8308c7fc425..11081232f12 100644 --- a/release/scripts/startup/bl_ui/properties_animviz.py +++ b/release/scripts/startup/bl_ui/properties_animviz.py @@ -25,7 +25,7 @@ # don't register these classes since they are only helpers. -class MotionPathButtonsPanel(): +class MotionPathButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_label = "Motion Paths" @@ -97,7 +97,7 @@ class MotionPathButtonsPanel(): # FIXME: this panel still needs to be ported so that it will work correctly with animviz -class OnionSkinButtonsPanel(): +class OnionSkinButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_label = "Onion Skinning" diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py index 0c5aae1de2f..9aa67223fc4 100644 --- a/release/scripts/startup/bl_ui/properties_constraint.py +++ b/release/scripts/startup/bl_ui/properties_constraint.py @@ -21,7 +21,7 @@ import bpy from bpy.types import Panel -class ConstraintButtonsPanel(): +class ConstraintButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "constraint" diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index 9453e9a4690..84e06d4c7fc 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -22,7 +22,7 @@ from bpy.types import Panel, Menu from rna_prop_ui import PropertyPanel -class ArmatureButtonsPanel(): +class ArmatureButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "data" @@ -144,7 +144,7 @@ class DATA_PT_bone_groups(ArmatureButtonsPanel, Panel): if group.color_set: col = split.column() sub = col.row(align=True) - sub.enabled = group.is_custom_color_set # only custom colors are editable + sub.enabled = group.is_custom_color_set # only custom colors are editable sub.prop(group.colors, "normal", text="") sub.prop(group.colors, "select", text="") sub.prop(group.colors, "active", text="") diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py index c07e9d677e7..a14e34580c5 100644 --- a/release/scripts/startup/bl_ui/properties_data_bone.py +++ b/release/scripts/startup/bl_ui/properties_data_bone.py @@ -23,7 +23,7 @@ from bpy.types import Panel from rna_prop_ui import PropertyPanel -class BoneButtonsPanel(): +class BoneButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "bone" diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py index 13a9b88f169..0b0b9b6690d 100644 --- a/release/scripts/startup/bl_ui/properties_data_camera.py +++ b/release/scripts/startup/bl_ui/properties_data_camera.py @@ -22,7 +22,7 @@ from bpy.types import Panel, Menu from rna_prop_ui import PropertyPanel -class CameraButtonsPanel(): +class CameraButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "data" @@ -109,11 +109,11 @@ class DATA_PT_lens(CameraButtonsPanel, Panel): elif ccam.panorama_type == 'EQUIRECTANGULAR': row = layout.row() sub = row.column(align=True) - sub.prop(ccam, "latitude_min"); - sub.prop(ccam, "latitude_max"); + sub.prop(ccam, "latitude_min") + sub.prop(ccam, "latitude_max") sub = row.column(align=True) - sub.prop(ccam, "longitude_min"); - sub.prop(ccam, "longitude_max"); + sub.prop(ccam, "longitude_min") + sub.prop(ccam, "longitude_max") elif engine == 'BLENDER_RENDER': row = col.row() if cam.lens_unit == 'MILLIMETERS': diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index 7cfdcccfb94..9277bbe20f9 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -24,7 +24,7 @@ from rna_prop_ui import PropertyPanel from bpy.types import Curve, SurfaceCurve, TextCurve -class CurveButtonsPanel(): +class CurveButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "data" diff --git a/release/scripts/startup/bl_ui/properties_data_empty.py b/release/scripts/startup/bl_ui/properties_data_empty.py index c93bebf2673..a752d3517de 100644 --- a/release/scripts/startup/bl_ui/properties_data_empty.py +++ b/release/scripts/startup/bl_ui/properties_data_empty.py @@ -21,7 +21,7 @@ import bpy from bpy.types import Panel -class DataButtonsPanel(): +class DataButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "data" diff --git a/release/scripts/startup/bl_ui/properties_data_lamp.py b/release/scripts/startup/bl_ui/properties_data_lamp.py index 3aa0b71ae04..6fef30fa3e6 100644 --- a/release/scripts/startup/bl_ui/properties_data_lamp.py +++ b/release/scripts/startup/bl_ui/properties_data_lamp.py @@ -30,7 +30,7 @@ class LAMP_MT_sunsky_presets(Menu): draw = Menu.draw_preset -class DataButtonsPanel(): +class DataButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "data" diff --git a/release/scripts/startup/bl_ui/properties_data_lattice.py b/release/scripts/startup/bl_ui/properties_data_lattice.py index 14d6ea66894..cbfa6961e8c 100644 --- a/release/scripts/startup/bl_ui/properties_data_lattice.py +++ b/release/scripts/startup/bl_ui/properties_data_lattice.py @@ -22,7 +22,7 @@ from bpy.types import Panel from rna_prop_ui import PropertyPanel -class DataButtonsPanel(): +class DataButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "data" diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 670ecf495be..5db8692e6d8 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -111,7 +111,7 @@ class MESH_UL_uvmaps_vcols(UIList): layout.label(text="", icon_value=icon) -class MeshButtonsPanel(): +class MeshButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "data" diff --git a/release/scripts/startup/bl_ui/properties_data_metaball.py b/release/scripts/startup/bl_ui/properties_data_metaball.py index cd894e60dbb..b42258c386a 100644 --- a/release/scripts/startup/bl_ui/properties_data_metaball.py +++ b/release/scripts/startup/bl_ui/properties_data_metaball.py @@ -22,7 +22,7 @@ from bpy.types import Panel from rna_prop_ui import PropertyPanel -class DataButtonsPanel(): +class DataButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "data" diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index e13d007a6d6..4c967079137 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -22,7 +22,7 @@ from bpy.types import Panel from bpy.app.translations import pgettext_iface as iface_ -class ModifierButtonsPanel(): +class ModifierButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "modifier" diff --git a/release/scripts/startup/bl_ui/properties_data_speaker.py b/release/scripts/startup/bl_ui/properties_data_speaker.py index ca922dfb544..5ed0f8c3265 100644 --- a/release/scripts/startup/bl_ui/properties_data_speaker.py +++ b/release/scripts/startup/bl_ui/properties_data_speaker.py @@ -22,7 +22,7 @@ from bpy.types import Panel from rna_prop_ui import PropertyPanel -class DataButtonsPanel(): +class DataButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "data" diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 606842db01d..2d91c998007 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -23,7 +23,7 @@ from bpy.types import Menu, Panel, UIList # Render properties -class RenderFreestyleButtonsPanel(): +class RenderFreestyleButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "render" @@ -62,7 +62,7 @@ class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel): # Render layer properties -class RenderLayerFreestyleButtonsPanel(): +class RenderLayerFreestyleButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "render_layer" @@ -701,7 +701,7 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, # Material properties -class MaterialFreestyleButtonsPanel(): +class MaterialFreestyleButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "material" diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 503b3cd234c..4d9dbe67226 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -21,7 +21,7 @@ import bpy from bpy.types import Panel, Menu -class PhysicsButtonsPanel(): +class PhysicsButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "physics" @@ -256,7 +256,7 @@ class PHYSICS_PT_game_obstacles(PhysicsButtonsPanel, Panel): row.label() -class RenderButtonsPanel(): +class RenderButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "render" @@ -455,7 +455,7 @@ class RENDER_PT_game_display(RenderButtonsPanel, Panel): col.prop(gs, "frame_color", text="") -class SceneButtonsPanel(): +class SceneButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "scene" @@ -535,7 +535,7 @@ class RENDER_PT_game_sound(RenderButtonsPanel, Panel): col.prop(scene, "audio_doppler_factor") -class WorldButtonsPanel(): +class WorldButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "world" @@ -691,7 +691,7 @@ class WORLD_PT_game_physics_obstacles(WorldButtonsPanel, Panel): layout.prop(gs, "show_obstacle_simulation") -class DataButtonsPanel(): +class DataButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "data" @@ -749,7 +749,7 @@ class DATA_PT_shadow_game(DataButtonsPanel, Panel): row.prop(lamp, "shadow_frustum_size", text="Frustum Size") -class ObjectButtonsPanel(): +class ObjectButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "object" diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index 81079edd938..9969c568bf9 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -41,7 +41,7 @@ def gpencil_stroke_placement_settings(context, layout, gpd): row.prop(gpd, "use_stroke_endpoints") -class GreasePencilDrawingToolsPanel(): +class GreasePencilDrawingToolsPanel: # subclass must set # bl_space_type = 'IMAGE_EDITOR' bl_label = "Grease Pencil" @@ -89,7 +89,7 @@ class GreasePencilDrawingToolsPanel(): col.operator("view3d.ruler") -class GreasePencilStrokeEditPanel(): +class GreasePencilStrokeEditPanel: # subclass must set # bl_space_type = 'IMAGE_EDITOR' bl_label = "Edit Strokes" @@ -196,8 +196,8 @@ class GPENCIL_PIE_tool_palette(Menu): col = pie.column() row = col.row(align=True) row.operator("transform.translate", icon='MAN_TRANS').gpencil_strokes = True - row.operator("transform.rotate", icon='MAN_ROT').gpencil_strokes = True - row.operator("transform.resize", text="Scale", icon='MAN_SCALE').gpencil_strokes = True + row.operator("transform.rotate", icon='MAN_ROT').gpencil_strokes = True + row.operator("transform.resize", text="Scale", icon='MAN_SCALE').gpencil_strokes = True row = col.row(align=True) row.label("Proportional Edit:") row.prop(context.tool_settings, "proportional_edit", text="", icon_only=True) @@ -314,9 +314,9 @@ class GPENCIL_UL_layer(UIList): split = layout.split(percentage=0.25) row = split.row(align=True) - row.prop(gpl, "color", text="", emboss = gpl.is_stroke_visible) - row.prop(gpl, "fill_color", text="", emboss = gpl.is_fill_visible) - split.prop(gpl, "info", text="", emboss=False) + row.prop(gpl, "color", text="", emboss=gpl.is_stroke_visible) + row.prop(gpl, "fill_color", text="", emboss=gpl.is_fill_visible) + split.prop(gpl, "info", text="", emboss=False) row = layout.row(align=True) row.prop(gpl, "lock", text="", emboss=False) @@ -326,7 +326,7 @@ class GPENCIL_UL_layer(UIList): layout.label(text="", icon_value=icon) -class GreasePencilDataPanel(): +class GreasePencilDataPanel: # subclass must set # bl_space_type = 'IMAGE_EDITOR' bl_label = "Grease Pencil" @@ -371,7 +371,7 @@ class GreasePencilDataPanel(): gpl = context.active_gpencil_layer if gpl: - sub.operator("gpencil.layer_duplicate", icon='COPY_ID', text="") # XXX: needs a dedicated icon + sub.operator("gpencil.layer_duplicate", icon='COPY_ID', text="") # XXX: needs a dedicated icon col.separator() @@ -455,7 +455,7 @@ class GreasePencilDataPanel(): sub.prop(gpl, "ghost_after_range", text="After") -class GreasePencilToolsPanel(): +class GreasePencilToolsPanel: # subclass must set # bl_space_type = 'IMAGE_EDITOR' # bl_options = {'DEFAULT_CLOSED'} diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py index 9a2857cc7b8..a455677abb4 100644 --- a/release/scripts/startup/bl_ui/properties_mask_common.py +++ b/release/scripts/startup/bl_ui/properties_mask_common.py @@ -112,7 +112,7 @@ class MASK_PT_layers: row.prop(active_layer, "use_fill_holes", text="Holes") -class MASK_PT_spline(): +class MASK_PT_spline: # subclasses must define... #~ bl_space_type = 'CLIP_EDITOR' #~ bl_region_type = 'UI' @@ -146,7 +146,7 @@ class MASK_PT_spline(): col.prop(spline, "use_self_intersection_check") -class MASK_PT_point(): +class MASK_PT_point: # subclasses must define... #~ bl_space_type = 'CLIP_EDITOR' #~ bl_region_type = 'UI' @@ -201,7 +201,7 @@ class MASK_PT_point(): tracks_list, icon='ANIM_DATA', text="Track:") -class MASK_PT_display(): +class MASK_PT_display: # subclasses must define... #~ bl_space_type = 'CLIP_EDITOR' #~ bl_region_type = 'UI' @@ -227,7 +227,7 @@ class MASK_PT_display(): sub.prop(space_data, "mask_overlay_mode", text="") -class MASK_PT_transforms(): +class MASK_PT_transforms: # subclasses must define... #~ bl_space_type = 'CLIP_EDITOR' #~ bl_region_type = 'TOOLS' @@ -251,7 +251,7 @@ class MASK_PT_transforms(): col.operator("transform.transform", text="Scale Feather").mode = 'MASK_SHRINKFATTEN' -class MASK_PT_tools(): +class MASK_PT_tools: # subclasses must define... #~ bl_space_type = 'CLIP_EDITOR' #~ bl_region_type = 'TOOLS' @@ -289,7 +289,7 @@ class MASK_PT_tools(): col.operator("mask.shape_key_rekey", text="Re-Key Shape Points") -class MASK_PT_add(): +class MASK_PT_add: # subclasses must define... #~ bl_space_type = 'CLIP_EDITOR' #~ bl_region_type = 'TOOLS' diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index e3fcb0ef53e..20143b81d14 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -92,7 +92,7 @@ class MATERIAL_UL_matslots(UIList): layout.label(text="", icon_value=icon) -class MaterialButtonsPanel(): +class MaterialButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "material" @@ -875,7 +875,7 @@ class MATERIAL_PT_transp_game(MaterialButtonsPanel, Panel): layout.prop(mat, "alpha") -class VolumeButtonsPanel(): +class VolumeButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "material" diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index b822b65bc51..3ff7a248c60 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -22,7 +22,7 @@ from bpy.types import Panel, Menu from rna_prop_ui import PropertyPanel -class ObjectButtonsPanel(): +class ObjectButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "object" diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index ba1947b0c66..b0da65063d1 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -20,7 +20,7 @@ from bpy.types import Menu -class UnifiedPaintPanel(): +class UnifiedPaintPanel: # subclass must set # bl_space_type = 'IMAGE_EDITOR' # bl_region_type = 'UI' @@ -249,7 +249,7 @@ def brush_texture_settings(layout, brush, sculpt): col.prop(tex_slot, "angle", text="") if tex_slot.has_texture_angle_source: col.prop(tex_slot, "use_rake", text="Rake") - + if brush.brush_capabilities.has_random_texture_angle and tex_slot.has_random_texture_angle: if sculpt: if brush.sculpt_capabilities.has_random_texture_angle: @@ -296,7 +296,7 @@ def brush_mask_texture_settings(layout, brush): col.prop(mask_tex_slot, "angle", text="") if mask_tex_slot.has_texture_angle_source: col.prop(mask_tex_slot, "use_rake", text="Rake") - + if brush.brush_capabilities.has_random_texture_angle and mask_tex_slot.has_random_texture_angle: col.prop(mask_tex_slot, "use_random", text="Random") if mask_tex_slot.use_random: diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 681898d1659..d1d6ee64598 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -88,7 +88,7 @@ class PARTICLE_MT_hair_dynamics_presets(Menu): draw = Menu.draw_preset -class ParticleButtonsPanel(): +class ParticleButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "particle" @@ -104,6 +104,7 @@ def find_modifier(ob, psys): if md.particle_system == psys: return md + class PARTICLE_UL_particle_systems(bpy.types.UIList): def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index, flt_flag): ob = data diff --git a/release/scripts/startup/bl_ui/properties_physics_cloth.py b/release/scripts/startup/bl_ui/properties_physics_cloth.py index 45dd1bf5130..f141c0b1b29 100644 --- a/release/scripts/startup/bl_ui/properties_physics_cloth.py +++ b/release/scripts/startup/bl_ui/properties_physics_cloth.py @@ -37,7 +37,7 @@ class CLOTH_MT_presets(Menu): draw = Menu.draw_preset -class PhysicButtonsPanel(): +class PhysicButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "physics" diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py index 4df8eab7d10..bb0f0cfc796 100644 --- a/release/scripts/startup/bl_ui/properties_physics_common.py +++ b/release/scripts/startup/bl_ui/properties_physics_common.py @@ -23,7 +23,7 @@ from bpy.types import Panel from bpy.app.translations import contexts as i18n_contexts -class PhysicButtonsPanel(): +class PhysicButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "physics" diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py index f8cca01380a..01dcf837546 100644 --- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py +++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py @@ -47,7 +47,7 @@ class PHYSICS_UL_dynapaint_surfaces(UIList): row.label(text="", icon_value=sticon) -class PhysicButtonsPanel(): +class PhysicButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "physics" diff --git a/release/scripts/startup/bl_ui/properties_physics_field.py b/release/scripts/startup/bl_ui/properties_physics_field.py index 4a5c16a5a55..348f66da145 100644 --- a/release/scripts/startup/bl_ui/properties_physics_field.py +++ b/release/scripts/startup/bl_ui/properties_physics_field.py @@ -26,7 +26,7 @@ from bl_ui.properties_physics_common import ( ) -class PhysicButtonsPanel(): +class PhysicButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "physics" diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 7b96d784fed..d6fd8f3792c 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -29,7 +29,7 @@ class FLUID_MT_presets(Menu): draw = Menu.draw_preset -class PhysicButtonsPanel(): +class PhysicButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "physics" diff --git a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py index 5f589c499d3..e7225d73e41 100644 --- a/release/scripts/startup/bl_ui/properties_physics_rigidbody.py +++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody.py @@ -21,7 +21,7 @@ import bpy from bpy.types import Panel -class PHYSICS_PT_rigidbody_panel(): +class PHYSICS_PT_rigidbody_panel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "physics" diff --git a/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py b/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py index dcf63f25079..3f5e0f1fc9b 100644 --- a/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py +++ b/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py @@ -21,7 +21,7 @@ import bpy from bpy.types import Panel -class PHYSICS_PT_rigidbody_constraint_panel(): +class PHYSICS_PT_rigidbody_constraint_panel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "physics" diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py index 426bf858bdb..63268bc6672 100644 --- a/release/scripts/startup/bl_ui/properties_physics_smoke.py +++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py @@ -26,7 +26,7 @@ from bl_ui.properties_physics_common import ( ) -class PhysicButtonsPanel(): +class PhysicButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "physics" diff --git a/release/scripts/startup/bl_ui/properties_physics_softbody.py b/release/scripts/startup/bl_ui/properties_physics_softbody.py index f96ab3f8cb1..e74cac3d06b 100644 --- a/release/scripts/startup/bl_ui/properties_physics_softbody.py +++ b/release/scripts/startup/bl_ui/properties_physics_softbody.py @@ -30,7 +30,7 @@ def softbody_panel_enabled(md): return (md.point_cache.is_baked is False) -class PhysicButtonsPanel(): +class PhysicButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "physics" diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 9ffd244d78f..b596fe48b49 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -43,7 +43,7 @@ class RENDER_MT_framerate_presets(Menu): draw = Menu.draw_preset -class RenderButtonsPanel(): +class RenderButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "render" diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py index 554eef8f0f1..35032d38933 100644 --- a/release/scripts/startup/bl_ui/properties_render_layer.py +++ b/release/scripts/startup/bl_ui/properties_render_layer.py @@ -21,7 +21,7 @@ import bpy from bpy.types import Panel, UIList -class RenderLayerButtonsPanel(): +class RenderLayerButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "render_layer" diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index b3635acd392..d601e5619a5 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -40,7 +40,7 @@ class SCENE_UL_keying_set_paths(UIList): layout.label(text="", icon_value=icon) -class SceneButtonsPanel(): +class SceneButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "scene" @@ -85,7 +85,7 @@ class SCENE_PT_unit(SceneButtonsPanel, Panel): row.prop(unit, "use_separate") -class SceneKeyingSetsPanel(): +class SceneKeyingSetsPanel: def draw_keyframing_settings(self, context, layout, ks, ksp): self.draw_keyframing_setting(context, layout, ks, ksp, "Needed", "use_insertkey_override_needed", "use_insertkey_needed", @@ -121,7 +121,7 @@ class SceneKeyingSetsPanel(): propname = prop row = layout.row(align=True) - row.prop(item, toggle_prop, text="", icon='STYLUS_PRESSURE', toggle=True) # XXX: needs dedicated icon + row.prop(item, toggle_prop, text="", icon='STYLUS_PRESSURE', toggle=True) # XXX: needs dedicated icon subrow = row.row() subrow.active = getattr(item, toggle_prop) diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index a0c4e0c92c3..23b5e5779f9 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -116,7 +116,7 @@ def id_tex_datablock(bid): return bid -class TextureButtonsPanel(): +class TextureButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "texture" @@ -135,8 +135,8 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, Panel): @classmethod def poll(cls, context): engine = context.scene.render.engine - #if not (hasattr(context, "texture_slot") or hasattr(context, "texture_node")): - #return False + # if not (hasattr(context, "texture_slot") or hasattr(context, "texture_node")): + # return False return ((context.material or context.world or context.lamp or diff --git a/release/scripts/startup/bl_ui/properties_world.py b/release/scripts/startup/bl_ui/properties_world.py index 39a8986a20c..2c8a6fac967 100644 --- a/release/scripts/startup/bl_ui/properties_world.py +++ b/release/scripts/startup/bl_ui/properties_world.py @@ -22,7 +22,7 @@ from bpy.types import Panel from rna_prop_ui import PropertyPanel -class WorldButtonsPanel(): +class WorldButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' bl_context = "world" @@ -49,7 +49,6 @@ class WORLD_PT_context_world(WorldButtonsPanel, Panel): scene = context.scene world = context.world space = context.space_data - rd = context.scene.render texture_count = world and len(world.texture_slots.keys()) diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index f901d9d9262..caf1e73c5f6 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -134,7 +134,6 @@ class DOPESHEET_HT_header(Header): row.operator("action.paste", text="", icon='PASTEFLIPDOWN').flipped = True - class DOPESHEET_MT_editor_menus(Menu): bl_idname = "DOPESHEET_MT_editor_menus" bl_label = "" diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index f1dd594aaf9..44be2780c75 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -1043,7 +1043,8 @@ class IMAGE_PT_tools_mask(MASK_PT_tools, Panel): # --- end mask --- -class ImageScopesPanel(): + +class ImageScopesPanel: @classmethod def poll(cls, context): sima = context.space_data @@ -1057,6 +1058,7 @@ class ImageScopesPanel(): return False return True + class IMAGE_PT_view_histogram(ImageScopesPanel, Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'TOOLS' @@ -1150,6 +1152,7 @@ class IMAGE_PT_grease_pencil(GreasePencilDataPanel, Panel): # NOTE: this is just a wrapper around the generic GP Panel + # Grease Pencil drawing tools class IMAGE_PT_tools_grease_pencil_draw(GreasePencilDrawingToolsPanel, Panel): bl_space_type = 'IMAGE_EDITOR' diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 4cc72f1dc4b..fadc0074611 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -464,8 +464,8 @@ class NODE_PT_grease_pencil_tools(GreasePencilToolsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} # NOTE: this is just a wrapper around the generic GP tools panel - # It contains access to some essential tools usually found only in - # toolbar, but which may not necessarily be open + # It contains access to some essential tools usually found only in + # toolbar, but which may not necessarily be open # Tool Shelf ------------------ @@ -484,6 +484,7 @@ class NODE_PT_tools_grease_pencil_edit(GreasePencilStrokeEditPanel, Panel): # ----------------------------- + def node_draw_tree_view(layout, context): pass diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 8852ff84fe0..43cfa3666e6 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -113,7 +113,7 @@ class SEQUENCER_HT_header(Header): row.prop(toolsettings, "proportional_edit", icon_only=True) if toolsettings.proportional_edit != 'DISABLED': row.prop(toolsettings, "proportional_edit_falloff", icon_only=True) - + row = layout.row(align=True) row.operator("render.opengl", text="", icon='RENDER_STILL').sequencer = True props = row.operator("render.opengl", text="", icon='RENDER_ANIMATION') @@ -427,7 +427,7 @@ class SEQUENCER_MT_strip(Menu): layout.menu("SEQUENCER_MT_change") -class SequencerButtonsPanel(): +class SequencerButtonsPanel: bl_space_type = 'SEQUENCE_EDITOR' bl_region_type = 'UI' @@ -440,7 +440,7 @@ class SequencerButtonsPanel(): return cls.has_sequencer(context) and (act_strip(context) is not None) -class SequencerButtonsPanel_Output(): +class SequencerButtonsPanel_Output: bl_space_type = 'SEQUENCE_EDITOR' bl_region_type = 'UI' @@ -929,7 +929,7 @@ class SEQUENCER_PT_proxy(SequencerButtonsPanel, Panel): row.prop(strip.proxy, "build_50") row.prop(strip.proxy, "build_75") row.prop(strip.proxy, "build_100") - layout.prop(strip.proxy, "use_overwrite"); + layout.prop(strip.proxy, "use_overwrite") col = layout.column() col.label(text="Build JPEG quality") @@ -1079,8 +1079,8 @@ class SEQUENCER_PT_grease_pencil_tools(GreasePencilToolsPanel, SequencerButtonsP bl_region_type = 'UI' # NOTE: this is just a wrapper around the generic GP tools panel - # It contains access to some essential tools usually found only in - # toolbar, which doesn't exist here... + # It contains access to some essential tools usually found only in + # toolbar, which doesn't exist here... if __name__ == "__main__": # only for live edit. diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 1db3aa0d144..c0099a6895e 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -174,7 +174,7 @@ class VIEW3D_MT_editor_menus(Menu): # ********** Utilities ********** -class ShowHideMenu(): +class ShowHideMenu: bl_label = "Show/Hide" _operator_name = "" @@ -2723,6 +2723,7 @@ class VIEW3D_MT_edit_armature_roll(Menu): # ********** Panel ********** + class VIEW3D_PT_grease_pencil(GreasePencilDataPanel, Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'UI' diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 9879ba8f4b9..2ce64d0e957 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -31,7 +31,7 @@ from bl_ui.properties_paint_common import ( ) -class View3DPanel(): +class View3DPanel: bl_space_type = 'VIEW_3D' bl_region_type = 'TOOLS' @@ -786,6 +786,7 @@ class View3DPaintPanel(UnifiedPaintPanel): bl_space_type = 'VIEW_3D' bl_region_type = 'TOOLS' + class VIEW3D_PT_imapaint_tools_missing(Panel, View3DPaintPanel): bl_category = "Tools" bl_label = "Missing Data" @@ -806,14 +807,13 @@ class VIEW3D_PT_imapaint_tools_missing(Panel, View3DPaintPanel): col.label("Missing UVs", icon='INFO') col.label("Unwrap the mesh in edit mode or generate a simple UV layer") col.operator("paint.add_simple_uvs") - + if toolsettings.mode == 'MATERIAL': if toolsettings.missing_materials: col.separator() col.label("Missing Materials", icon='INFO') col.label("Add a material and paint slot below") col.operator_menu_enum("paint.add_texture_paint_slot", "type", text="Add Paint Slot") - elif toolsettings.missing_texture: ob = context.active_object mat = ob.active_material @@ -827,7 +827,6 @@ class VIEW3D_PT_imapaint_tools_missing(Panel, View3DPaintPanel): col.label("Missing Materials", icon='INFO') col.label("Add a material and paint slot below") col.operator_menu_enum("paint.add_texture_paint_slot", "type", text="Add Paint Slot") - elif toolsettings.mode == 'IMAGE': if toolsettings.missing_texture: @@ -846,6 +845,7 @@ class VIEW3D_PT_imapaint_tools_missing(Panel, View3DPaintPanel): col.template_ID(toolsettings, "stencil_image") col.operator("image.new", text="New").gen_context = 'PAINT_STENCIL' + class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): bl_category = "Tools" bl_label = "Brush" @@ -1074,6 +1074,7 @@ class TEXTURE_UL_texpaintslots(UIList): layout.alignment = 'CENTER' layout.label(text="") + class VIEW3D_MT_tools_projectpaint_uvlayer(Menu): bl_label = "Clone Layer" @@ -1137,7 +1138,7 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel): if slot: col.prop(mat.texture_slots[slot.index], "blend_type") col.separator() - + if slot and slot.index != -1: col.label("UV Map") col.prop_search(slot, "uv_layer", ob.data, "uv_textures", text="") @@ -1189,7 +1190,6 @@ class VIEW3D_PT_stencil_projectpaint(View3DPanel, Panel): col.template_ID(ipaint, "stencil_image") col.operator("image.new", text="New").gen_context = 'PAINT_STENCIL' - col.label("Visualization") row = col.row(align=True) row.prop(ipaint, "stencil_color", text="") diff --git a/source/blender/datatoc/datatoc_icon_split.py b/source/blender/datatoc/datatoc_icon_split.py index 55f0a5c5f6a..aae907ec340 100755 --- a/source/blender/datatoc/datatoc_icon_split.py +++ b/source/blender/datatoc/datatoc_icon_split.py @@ -63,7 +63,7 @@ def image_from_file(filepath): try: import bpy - except: + except ImportError: bpy = None if bpy is not None: diff --git a/tests/python/pep8.py b/tests/python/pep8.py index 7713ffeaaa4..551e2a87e9b 100644 --- a/tests/python/pep8.py +++ b/tests/python/pep8.py @@ -95,13 +95,23 @@ def main(): print(" %s" % f) # strict imports - print("\n\n\n# running pep8...") + print("\n\n\n# checking imports...") import re import_check = re.compile(r"\s*from\s+[A-z\.]+\s+import \*\s*") for f, pep8_type in files: for i, l in enumerate(open(f, 'r', encoding='utf8')): if import_check.match(l): print("%s:%d:0: global import bad practice" % (f, i + 1)) + del re, import_check + + print("\n\n\n# checking class definitions...") + import re + class_check = re.compile(r"\s*class\s+.*\(\):.*") + for f, pep8_type in files: + for i, l in enumerate(open(f, 'r', encoding='utf8')): + if class_check.match(l): + print("%s:%d:0: empty class (), remove" % (f, i + 1)) + del re, class_check print("\n\n\n# running pep8...") -- cgit v1.2.3