[Bf-blender-cvs] [a15be34] master: Code cleanup: unused python vars & imports
Campbell Barton
noreply at git.blender.org
Thu Apr 24 21:36:43 CEST 2014
Commit: a15be343895d4f3481eb349b4d145ffbe1c10dce
Author: Campbell Barton
Date: Fri Apr 25 05:31:20 2014 +1000
https://developer.blender.org/rBa15be343895d4f3481eb349b4d145ffbe1c10dce
Code cleanup: unused python vars & imports
Use frosted rather then pyflakes
===================================================================
M doc/python_api/sphinx_doc_gen.py
M intern/cycles/blender/addon/ui.py
M release/scripts/modules/addon_utils.py
M release/scripts/modules/bpy_extras/view3d_utils.py
M release/scripts/modules/nodeitems_utils.py
M release/scripts/modules/rna_keymap_ui.py
M release/scripts/startup/bl_operators/add_mesh_torus.py
M release/scripts/startup/bl_operators/mesh.py
M release/scripts/startup/bl_operators/node.py
M release/scripts/startup/bl_operators/object.py
M release/scripts/startup/bl_operators/vertexpaint_dirt.py
M release/scripts/startup/bl_operators/view3d.py
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/__init__.py
M release/scripts/startup/bl_ui/properties_data_armature.py
M release/scripts/startup/bl_ui/properties_data_mesh.py
M release/scripts/startup/bl_ui/properties_mask_common.py
M release/scripts/startup/bl_ui/properties_material.py
M release/scripts/startup/bl_ui/properties_object.py
M release/scripts/startup/bl_ui/properties_render_layer.py
M release/scripts/startup/bl_ui/properties_scene.py
M release/scripts/startup/bl_ui/space_clip.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_node.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/datatoc/datatoc_icon_split.py
M source/tests/bl_rna_wiki_reference.py
M source/tests/pep8.py
M source/tests/rst_to_doctree_mini.py
===================================================================
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index 4cea81d..3169fda 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -62,7 +62,7 @@ Sphinx: PDF generation
try:
import bpy # blender module
-except:
+except ImportError:
print("\nERROR: this script must run from inside Blender")
print(SCRIPT_HELP_MSG)
import sys
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py
index a064b4f..4cdc721 100644
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@ -571,7 +571,7 @@ class CyclesObject_PT_motion_blur(CyclesButtonsPanel, Panel):
rd = context.scene.render
scene = context.scene
- cscene = scene.cycles
+ # cscene = scene.cycles
layout.active = rd.use_motion_blur
@@ -585,7 +585,7 @@ class CyclesObject_PT_motion_blur(CyclesButtonsPanel, Panel):
rd = context.scene.render
scene = context.scene
- cscene = scene.cycles
+ # cscene = scene.cycles
ob = context.object
cob = ob.cycles
@@ -1194,7 +1194,7 @@ class CyclesRender_PT_CurveRendering(CyclesButtonsPanel, Panel):
@classmethod
def poll(cls, context):
scene = context.scene
- cscene = scene.cycles
+ # cscene = scene.cycles
psys = context.particle_system
return CyclesButtonsPanel.poll(context) and psys and psys.settings.type == 'HAIR'
@@ -1233,7 +1233,7 @@ class CyclesParticle_PT_CurveSettings(CyclesButtonsPanel, Panel):
@classmethod
def poll(cls, context):
scene = context.scene
- cscene = scene.cycles
+ # cscene = scene.cycles
ccscene = scene.cycles_curves
psys = context.particle_system
use_curves = ccscene.use_curves and psys
diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py
index e76bcc0..88356b6 100644
--- a/release/scripts/modules/addon_utils.py
+++ b/release/scripts/modules/addon_utils.py
@@ -229,9 +229,9 @@ def check(module_name):
def _addon_ensure(module_name):
addons = _user_preferences.addons
- addon = _user_preferences.addons.get(module_name)
+ addon = addons.get(module_name)
if not addon:
- addon = _user_preferences.addons.new()
+ addon = addons.new()
addon.module = module_name
diff --git a/release/scripts/modules/bpy_extras/view3d_utils.py b/release/scripts/modules/bpy_extras/view3d_utils.py
index 7a075e9..ad555a4 100644
--- a/release/scripts/modules/bpy_extras/view3d_utils.py
+++ b/release/scripts/modules/bpy_extras/view3d_utils.py
@@ -73,16 +73,11 @@ def region_2d_to_origin_3d(region, rv3d, coord):
:return: The origin of the viewpoint in 3d space.
:rtype: :class:`mathutils.Vector`
"""
- from mathutils import Vector
-
viewinv = rv3d.view_matrix.inverted()
if rv3d.is_perspective:
- from mathutils.geometry import intersect_line_plane
-
origin_start = viewinv.translation.copy()
else:
- from mathutils.geometry import intersect_point_line
persmat = rv3d.perspective_matrix.copy()
dx = (2.0 * coord[0] / region.width) - 1.0
dy = (2.0 * coord[1] / region.height) - 1.0
diff --git a/release/scripts/modules/nodeitems_utils.py b/release/scripts/modules/nodeitems_utils.py
index 7418452..f017c76 100644
--- a/release/scripts/modules/nodeitems_utils.py
+++ b/release/scripts/modules/nodeitems_utils.py
@@ -18,7 +18,6 @@
# <pep8 compliant>
import bpy
-from bpy.types import Menu, Panel
class NodeCategory():
@@ -92,7 +91,6 @@ def register_node_categories(identifier, cat_list):
def draw_node_item(self, context):
layout = self.layout
col = layout.column()
- default_context = bpy.app.translations.contexts.default
for item in self.category.items(context):
item.draw(item, col, context)
diff --git a/release/scripts/modules/rna_keymap_ui.py b/release/scripts/modules/rna_keymap_ui.py
index dde26d6..12d99a0 100644
--- a/release/scripts/modules/rna_keymap_ui.py
+++ b/release/scripts/modules/rna_keymap_ui.py
@@ -292,7 +292,6 @@ def draw_filtered(display_keymaps, filter_type, filter_text, layout):
kmi_type_set.add(v)
return kmi_type_set
- kmi_type_set_combine = None
for i, kmi_type in enumerate(filter_text_split):
kmi_type_set = kmi_type_set_from_string(kmi_type)
diff --git a/release/scripts/startup/bl_operators/add_mesh_torus.py b/release/scripts/startup/bl_operators/add_mesh_torus.py
index 39b0df1..449a4ce 100644
--- a/release/scripts/startup/bl_operators/add_mesh_torus.py
+++ b/release/scripts/startup/bl_operators/add_mesh_torus.py
@@ -22,7 +22,6 @@ from bpy.types import Operator
from bpy.props import (FloatProperty,
IntProperty,
- BoolProperty,
)
from bpy.app.translations import pgettext_data as data_
diff --git a/release/scripts/startup/bl_operators/mesh.py b/release/scripts/startup/bl_operators/mesh.py
index cead7d6..f86c31c 100644
--- a/release/scripts/startup/bl_operators/mesh.py
+++ b/release/scripts/startup/bl_operators/mesh.py
@@ -87,7 +87,6 @@ class MeshMirrorUV(Operator):
polys = mesh.polygons
loops = mesh.loops
- verts = mesh.vertices
uv_loops = mesh.uv_layers.active.data
nbr_polys = len(polys)
diff --git a/release/scripts/startup/bl_operators/node.py b/release/scripts/startup/bl_operators/node.py
index 13189b2..9bdd928 100644
--- a/release/scripts/startup/bl_operators/node.py
+++ b/release/scripts/startup/bl_operators/node.py
@@ -61,7 +61,6 @@ class NodeAddOperator():
@staticmethod
def store_mouse_cursor(context, event):
space = context.space_data
- v2d = context.region.view2d
tree = space.edit_tree
# convert mouse position to the View2D for later node placement
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index ae13ba8..04f4cba 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -687,7 +687,6 @@ class TransformsToDeltasAnim(Operator):
DELTA_PATHS = STANDARD_TO_DELTA_PATHS.values()
# try to apply on each selected object
- success = False
for obj in context.selected_editable_objects:
adt = obj.animation_data
if (adt is None) or (adt.action is None):
@@ -792,7 +791,6 @@ class LodByName(Operator):
return (context.active_object is not None)
def execute(self, context):
- scene = context.scene
ob = context.active_object
prefix = ""
@@ -843,7 +841,6 @@ class LodClearAll(Operator):
return (context.active_object is not None)
def execute(self, context):
- scene = context.scene
ob = context.active_object
if ob.lod_levels:
diff --git a/release/scripts/startup/bl_operators/vertexpaint_dirt.py b/release/scripts/startup/bl_operators/vertexpaint_dirt.py
index cd3ffb9..68c9bc1 100644
--- a/release/scripts/startup/bl_operators/vertexpaint_dirt.py
+++ b/release/scripts/startup/bl_operators/vertexpaint_dirt.py
@@ -183,7 +183,6 @@ class VertexPaintDirt(Operator):
def execute(self, context):
import time
- from math import radians
obj = context.object
mesh = obj.data
diff --git a/release/scripts/startup/bl_operators/view3d.py b/release/scripts/startup/bl_operators/view3d.py
index da66286..85cc921 100644
--- a/release/scripts/startup/bl_operators/view3d.py
+++ b/release/scripts/startup/bl_operators/view3d.py
@@ -19,7 +19,6 @@
# <pep8-80 compliant>
import bpy
-import mathutils
from bpy.types import Operator
from bpy.props import BoolProperty
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 3fdde1a..86ae8fd 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -19,7 +19,7 @@
# <pep8 compliant>
import bpy
-from bpy.types import Menu, Operator
+from bpy.types import Operator
from bpy.props import (StringProperty,
BoolProperty,
IntProperty,
diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index 793cbf8..6b72ef1 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -195,7 +195,6 @@ class UI_UL_list(bpy.types.UIList):
return a list mapping org_idx -> new_idx,
or an empty list if no sorting has been done.
"""
- neworder = [None] * len(items)
_sort = [(idx, getattr(it, propname, "")) for idx, it in enumerate(items)]
return cls.sort_items_helper(_sort, lambda e: e[1].lower())
diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py
index f4ec2ce..c6823f1 100644
--- a/release/scripts/startup/bl_ui/properties_data_armature.py
+++ b/release/scripts/startup/bl_ui/properties_data_armature.py
@@ -292,7 +292,7 @@ class DATA_PT_motion_paths(MotionPathButtonsPanel, Panel):
return (context.object) and (context.armature)
def draw(self, context):
- layout = self.layout
+ # layout = self.layout
ob = context.object
avs = ob.pose.animation_visualization
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index edf3354..622c9ba 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -76,7 +76,7 @@ class MESH_UL_shape_keys(UIList):
def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index):
# assert(isinstance(item, bpy.types.ShapeKey)
obj = active_data
- key = data
+ # key = data
key_block = item
if self.layout_type in {'DEFAULT', 'CO
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list