diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-01-16 03:15:32 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-16 03:15:32 +0400 |
commit | 97d62f018397d279f6f1654c76d1e6b414c9d343 (patch) | |
tree | 62c6daa8b6360664cad86a88995ea89024ec9211 /release/scripts/modules | |
parent | 87f8925a7637cf78ff72024059ab158f43116807 (diff) |
style cleanup
Diffstat (limited to 'release/scripts/modules')
-rw-r--r-- | release/scripts/modules/addon_utils.py | 6 | ||||
-rw-r--r-- | release/scripts/modules/bl_i18n_utils/spell_check_utils.py | 2 | ||||
-rw-r--r-- | release/scripts/modules/bpy/path.py | 1 | ||||
-rw-r--r-- | release/scripts/modules/bpy/utils.py | 3 | ||||
-rw-r--r-- | release/scripts/modules/bpy_extras/io_utils.py | 10 | ||||
-rw-r--r-- | release/scripts/modules/bpy_extras/mesh_utils.py | 6 | ||||
-rw-r--r-- | release/scripts/modules/bpy_extras/object_utils.py | 2 | ||||
-rw-r--r-- | release/scripts/modules/bpy_extras/view3d_utils.py | 4 | ||||
-rw-r--r-- | release/scripts/modules/bpy_restrict_state.py | 4 | ||||
-rw-r--r-- | release/scripts/modules/bpy_types.py | 5 |
10 files changed, 26 insertions, 17 deletions
diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py index 65ea91cf8ce..02115054396 100644 --- a/release/scripts/modules/addon_utils.py +++ b/release/scripts/modules/addon_utils.py @@ -208,9 +208,9 @@ def check(module_name): if loaded_state is Ellipsis: print("Warning: addon-module %r found module " - "but without __addon_enabled__ field, " - "possible name collision from file: %r" % - (module_name, getattr(mod, "__file__", "<unknown>"))) + "but without __addon_enabled__ field, " + "possible name collision from file: %r" % + (module_name, getattr(mod, "__file__", "<unknown>"))) loaded_state = False diff --git a/release/scripts/modules/bl_i18n_utils/spell_check_utils.py b/release/scripts/modules/bl_i18n_utils/spell_check_utils.py index 3fd039c7436..aabad116bd9 100644 --- a/release/scripts/modules/bl_i18n_utils/spell_check_utils.py +++ b/release/scripts/modules/bl_i18n_utils/spell_check_utils.py @@ -37,7 +37,7 @@ dict_uimsgs = { "aren", # aren't "betweens", # yuck! in-betweens! "boolean", "booleans", - "couldn", #couldn't + "couldn", # couldn't "decrement", "derivate", "doesn", # doesn't diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py index 69ed4314f6f..6c91568cbc1 100644 --- a/release/scripts/modules/bpy/path.py +++ b/release/scripts/modules/bpy/path.py @@ -47,6 +47,7 @@ from _bpy_path import (extensions_audio, extensions_image, ) + def abspath(path, start=None, library=None): """ Returns the absolute path relative to the current blend file diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py index 25fe6c1d4e5..7b5de231b4b 100644 --- a/release/scripts/modules/bpy/utils.py +++ b/release/scripts/modules/bpy/utils.py @@ -237,7 +237,8 @@ def load_scripts(reload_scripts=False, refresh_scripts=False): _addon_utils.reset_all(reload_scripts) # run the active integration preset - filepath = preset_find(_user_preferences.inputs.active_keyconfig, "keyconfig") + filepath = preset_find(_user_preferences.inputs.active_keyconfig, + "keyconfig") if filepath: keyconfig_set(filepath) diff --git a/release/scripts/modules/bpy_extras/io_utils.py b/release/scripts/modules/bpy_extras/io_utils.py index 0e9b6c136e9..21bad5ec1e4 100644 --- a/release/scripts/modules/bpy_extras/io_utils.py +++ b/release/scripts/modules/bpy_extras/io_utils.py @@ -341,7 +341,7 @@ path_reference_mode = EnumProperty( ('COPY', "Copy", "Copy the file to the destination path " "(or subdirectory)"), ), - default='AUTO' + default='AUTO', ) @@ -480,10 +480,10 @@ def unique_name(key, name, name_dict, name_max=-1, clean_func=None, sep="."): while name_new in name_dict_values: count_str = "%03d" % count name_new = "%.*s%s%s" % (name_max - (len(count_str) + 1), - name_new_orig, - sep, - count_str, - ) + name_new_orig, + sep, + count_str, + ) count += 1 name_dict[key] = name_new diff --git a/release/scripts/modules/bpy_extras/mesh_utils.py b/release/scripts/modules/bpy_extras/mesh_utils.py index 0166f954dc9..8b93b5922e9 100644 --- a/release/scripts/modules/bpy_extras/mesh_utils.py +++ b/release/scripts/modules/bpy_extras/mesh_utils.py @@ -247,7 +247,7 @@ def edge_loops_from_tessfaces(mesh, tessfaces=None, seams=()): break i = ed_adj.index(context_loop[-2]) - context_loop.append(ed_adj[not i]) + context_loop.append(ed_adj[not i]) # Dont look at this again del ed_adj[:] @@ -530,12 +530,12 @@ def face_random_points(num_points, tessfaces): tris.append((verts[fv[0]].co, verts[fv[1]].co, verts[fv[2]].co, - )) + )) if len(fv) == 4: tris.append((verts[fv[0]].co, verts[fv[3]].co, verts[fv[2]].co, - )) + )) tri_faces.append(tris) # For each face, generate the required number of random points diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py index 4e1385cff80..5797b8b7bf3 100644 --- a/release/scripts/modules/bpy_extras/object_utils.py +++ b/release/scripts/modules/bpy_extras/object_utils.py @@ -123,7 +123,7 @@ def object_data_add(context, obdata, operator=None, use_active_layer=True): base.layers[scene.active_layer] = True else: base.layers = [True if i == scene.active_layer - else False for i in range(len(scene.layers))] + else False for i in range(len(scene.layers))] if v3d: base.layers_from_view(context.space_data) diff --git a/release/scripts/modules/bpy_extras/view3d_utils.py b/release/scripts/modules/bpy_extras/view3d_utils.py index b2f366d5d1e..7a075e93e1a 100644 --- a/release/scripts/modules/bpy_extras/view3d_utils.py +++ b/release/scripts/modules/bpy_extras/view3d_utils.py @@ -50,7 +50,7 @@ def region_2d_to_vector_3d(region, rv3d, coord): out = Vector(((2.0 * coord[0] / region.width) - 1.0, (2.0 * coord[1] / region.height) - 1.0, -0.5 - )) + )) w = out.dot(persinv[3].xyz) + persinv[3][3] @@ -89,7 +89,7 @@ def region_2d_to_origin_3d(region, rv3d, coord): persinv = persmat.inverted() origin_start = ((persinv.col[0].xyz * dx) + (persinv.col[1].xyz * dy) + - viewinv.translation) + viewinv.translation) return origin_start diff --git a/release/scripts/modules/bpy_restrict_state.py b/release/scripts/modules/bpy_restrict_state.py index 0395a38f4a2..4aa3c5de573 100644 --- a/release/scripts/modules/bpy_restrict_state.py +++ b/release/scripts/modules/bpy_restrict_state.py @@ -28,14 +28,17 @@ __all__ = ( import bpy as _bpy + class _RestrictContext(): __slots__ = () _real_data = _bpy.data # safe, the pointer never changes _real_pref = _bpy.context.user_preferences + @property def window_manager(self): return self._real_data.window_managers[0] + @property def user_preferences(self): return self._real_pref @@ -51,6 +54,7 @@ _data_restrict = _RestrictData() class RestrictBlend(): __slots__ = ("context", "data") + def __enter__(self): self.data = _bpy.data self.context = _bpy.context diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index 6c4e1f74cc4..9161cc20d2c 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -484,13 +484,16 @@ class Text(bpy_types.ID): if cont.type == 'PYTHON'] ) + class NodeSocket(StructRNA): # , metaclass=RNAMeta __slots__ = () @property def links(self): """List of node links from or to this socket""" - return tuple(link for link in self.id_data.links if link.from_socket == self or link.to_socket == self) + return tuple(link for link in self.id_data.links + if (link.from_socket == self or + link.to_socket == self)) # values are module: [(cls, path, line), ...] |