[Bf-blender-cvs] [e17c6f7] master: cleanup: py imports
Campbell Barton
noreply at git.blender.org
Wed Jan 28 06:56:37 CET 2015
Commit: e17c6f79a57513eb1584fa79f698a8f3a85e0d9a
Author: Campbell Barton
Date: Tue Jan 27 17:46:07 2015 +1100
Branches: master
https://developer.blender.org/rBe17c6f79a57513eb1584fa79f698a8f3a85e0d9a
cleanup: py imports
===================================================================
M release/scripts/modules/bl_i18n_utils/merge_po.py
M release/scripts/modules/bl_i18n_utils/utils.py
M release/scripts/modules/bpy/path.py
M release/scripts/modules/bpy/utils.py
M release/scripts/startup/bl_operators/add_mesh_torus.py
M release/scripts/startup/bl_operators/anim.py
M release/scripts/startup/bl_operators/console.py
M release/scripts/startup/bl_operators/freestyle.py
M release/scripts/startup/bl_operators/node.py
M release/scripts/startup/bl_operators/object.py
M release/scripts/startup/bl_operators/object_quick_effects.py
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/properties_data_armature.py
M release/scripts/startup/bl_ui/properties_data_camera.py
M release/scripts/startup/bl_ui/properties_object.py
M release/scripts/startup/bl_ui/properties_particle.py
M release/scripts/startup/bl_ui/properties_physics_cloth.py
M release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
M release/scripts/startup/bl_ui/properties_physics_field.py
M release/scripts/startup/bl_ui/properties_physics_smoke.py
M release/scripts/startup/bl_ui/properties_physics_softbody.py
M release/scripts/startup/bl_ui/properties_scene.py
M release/scripts/startup/bl_ui/properties_texture.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_sequencer.py
===================================================================
diff --git a/release/scripts/modules/bl_i18n_utils/merge_po.py b/release/scripts/modules/bl_i18n_utils/merge_po.py
index d7dade2..2fda421 100755
--- a/release/scripts/modules/bl_i18n_utils/merge_po.py
+++ b/release/scripts/modules/bl_i18n_utils/merge_po.py
@@ -30,17 +30,20 @@
import sys
-try:
+if __package__ is None:
import settings
import utils
-except:
- from . import (settings, utils)
+else:
+ from . import (
+ settings,
+ utils,
+ )
# XXX This is a quick hack to make it work with new I18n... objects! To be reworked!
def main():
import argparse
- parser = argparse.ArgumentParser(description=""
+ parser = argparse.ArgumentParser(description=
"Merge one or more .po files into the first dest one.\n"
"If a msgkey (msgctxt, msgid) is present in more than one merged po, the one in the first file "
"wins, unless it’s marked as fuzzy and one later is not.\n"
diff --git a/release/scripts/modules/bl_i18n_utils/utils.py b/release/scripts/modules/bl_i18n_utils/utils.py
index 911e176..524fef9 100644
--- a/release/scripts/modules/bl_i18n_utils/utils.py
+++ b/release/scripts/modules/bl_i18n_utils/utils.py
@@ -31,9 +31,10 @@ import sys
import tempfile
#import time
-from bl_i18n_utils import (settings,
- utils_rtl,
- )
+from bl_i18n_utils import (
+ settings,
+ utils_rtl,
+ )
import bpy
diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py
index 874efc2..25a6c72 100644
--- a/release/scripts/modules/bpy/path.py
+++ b/release/scripts/modules/bpy/path.py
@@ -43,10 +43,11 @@ __all__ = (
import bpy as _bpy
import os as _os
-from _bpy_path import (extensions_audio,
- extensions_movie,
- extensions_image,
- )
+from _bpy_path import (
+ extensions_audio,
+ extensions_movie,
+ extensions_image,
+ )
def _getattr_bytes(var, attr):
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py
index bf882db..5f235ae 100644
--- a/release/scripts/modules/bpy/utils.py
+++ b/release/scripts/modules/bpy/utils.py
@@ -51,12 +51,12 @@ __all__ = (
)
from _bpy import (
- escape_identifier,
- register_class,
- unregister_class,
- blend_paths,
- resource_path,
- )
+ escape_identifier,
+ register_class,
+ unregister_class,
+ blend_paths,
+ resource_path,
+ )
from _bpy import script_paths as _bpy_script_paths
from _bpy import user_resource as _user_resource
from _bpy import _utils_units as units
diff --git a/release/scripts/startup/bl_operators/add_mesh_torus.py b/release/scripts/startup/bl_operators/add_mesh_torus.py
index 449a4ce..dfb734e 100644
--- a/release/scripts/startup/bl_operators/add_mesh_torus.py
+++ b/release/scripts/startup/bl_operators/add_mesh_torus.py
@@ -20,9 +20,10 @@
import bpy
from bpy.types import Operator
-from bpy.props import (FloatProperty,
- IntProperty,
- )
+from bpy.props import (
+ FloatProperty,
+ IntProperty,
+ )
from bpy.app.translations import pgettext_data as data_
from bpy_extras import object_utils
diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py
index 36445d7..1b3e719 100644
--- a/release/scripts/startup/bl_operators/anim.py
+++ b/release/scripts/startup/bl_operators/anim.py
@@ -27,11 +27,12 @@ if "bpy" in locals():
import bpy
from bpy.types import Operator
-from bpy.props import (IntProperty,
- BoolProperty,
- EnumProperty,
- StringProperty,
- )
+from bpy.props import (
+ IntProperty,
+ BoolProperty,
+ EnumProperty,
+ StringProperty,
+ )
class ANIM_OT_keying_set_export(Operator):
diff --git a/release/scripts/startup/bl_operators/console.py b/release/scripts/startup/bl_operators/console.py
index 4e99acd..8cfc977 100644
--- a/release/scripts/startup/bl_operators/console.py
+++ b/release/scripts/startup/bl_operators/console.py
@@ -20,9 +20,10 @@
import bpy
from bpy.types import Operator
-from bpy.props import (BoolProperty,
- StringProperty,
- )
+from bpy.props import (
+ BoolProperty,
+ StringProperty,
+ )
def _lang_module_get(sc):
diff --git a/release/scripts/startup/bl_operators/freestyle.py b/release/scripts/startup/bl_operators/freestyle.py
index 453be51..edda922 100644
--- a/release/scripts/startup/bl_operators/freestyle.py
+++ b/release/scripts/startup/bl_operators/freestyle.py
@@ -16,10 +16,13 @@
#
# ##### END GPL LICENSE BLOCK #####
-import sys
import bpy
-from bpy.props import (BoolProperty, EnumProperty, StringProperty)
+from bpy.props import (
+ BoolProperty,
+ EnumProperty,
+ StringProperty,
+ )
class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator):
@@ -29,11 +32,16 @@ class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator):
bl_label = "Fill Range by Selection"
bl_options = {'INTERNAL'}
- type = EnumProperty(name="Type", description="Type of the modifier to work on",
- items=(("COLOR", "Color", "Color modifier type"),
- ("ALPHA", "Alpha", "Alpha modifier type"),
- ("THICKNESS", "Thickness", "Thickness modifier type")))
- name = StringProperty(name="Name", description="Name of the modifier to work on")
+ type = EnumProperty(
+ name="Type", description="Type of the modifier to work on",
+ items=(("COLOR", "Color", "Color modifier type"),
+ ("ALPHA", "Alpha", "Alpha modifier type"),
+ ("THICKNESS", "Thickness", "Thickness modifier type")),
+ )
+ name = StringProperty(
+ name="Name",
+ description="Name of the modifier to work on",
+ )
@classmethod
def poll(cls, context):
@@ -41,6 +49,8 @@ class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator):
return rl and rl.freestyle_settings.linesets.active
def execute(self, context):
+ import sys
+
scene = context.scene
rl = scene.render.layers.active
lineset = rl.freestyle_settings.linesets.active
diff --git a/release/scripts/startup/bl_operators/node.py b/release/scripts/startup/bl_operators/node.py
index 9bdd928..264cfa3 100644
--- a/release/scripts/startup/bl_operators/node.py
+++ b/release/scripts/startup/bl_operators/node.py
@@ -20,15 +20,17 @@
import bpy
import nodeitems_utils
-from bpy.types import (Operator,
- PropertyGroup,
- )
-from bpy.props import (BoolProperty,
- CollectionProperty,
- EnumProperty,
- IntProperty,
- StringProperty,
- )
+from bpy.types import (
+ Operator,
+ PropertyGroup,
+ )
+from bpy.props import (
+ BoolProperty,
+ CollectionProperty,
+ EnumProperty,
+ IntProperty,
+ StringProperty,
+ )
class NodeSetting(PropertyGroup):
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index c1f75c7..1f8c89b 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -20,11 +20,13 @@
import bpy
from bpy.types import Operator
-from bpy.props import (StringProperty,
- BoolProperty,
- EnumProperty,
- IntProperty,
- FloatProperty)
+from bpy.props import (
+ StringProperty,
+ BoolProperty,
+ EnumProperty,
+ IntProperty,
+ FloatProperty,
+ )
class SelectPattern(Operator):
diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py
index 06dc82d..495b671 100644
--- a/release/scripts/startup/bl_operators/object_quick_effects.py
+++ b/release/scripts/startup/bl_operators/object_quick_effects.py
@@ -21,12 +21,13 @@
from mathutils import Vector
import bpy
from bpy.types import Operator
-from bpy.props import (BoolProperty,
- EnumProperty,
- IntProperty,
- FloatProperty,
- FloatVectorProperty,
- )
+from bpy.props import (
+ BoolProperty,
+ EnumProperty,
+ IntProperty,
+ FloatProperty,
+ FloatVectorProperty,
+ )
def object_ensure_material(obj, mat_name):
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index e7f48ec..53bf524 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -20,12 +20,13 @@
import bpy
from bpy.types import Operator
-from bpy.props import (StringProperty,
- BoolProperty,
- IntProperty,
- FloatProperty,
- EnumProperty,
- )
+from bpy.props import (
+ StringProperty,
+ BoolProperty,
+ IntProperty,
+ FloatProperty,
+ EnumProperty,
+ )
from bpy.app.translations import pgettext_tip as tip_
diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py
index 6a8f9c5..9453e9a 100644
--- a/release/scripts/startup/bl_ui/properties_data_armature.py
+++ b/release/scripts/startup/bl_ui/properties_data_armature.py
@@ -278,9 +278,10 @@ class DATA_PT_iksolver_itasc(ArmatureButtonsPanel, Panel):
row.prop(itasc, "damping_max", text="Damp", slider=True)
row.prop(itasc, "damping_epsilon", text="Eps", slider=True)
-f
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list