[Bf-extensions-cvs] [feec8b0] master: Cleanup: imports
Campbell Barton
noreply at git.blender.org
Tue Jul 26 09:48:18 CEST 2016
Commit: feec8b0ca8c231069adefe5996a38f94beb0d65f
Author: Campbell Barton
Date: Tue Jul 26 17:19:48 2016 +1000
Branches: master
https://developer.blender.org/rBACfeec8b0ca8c231069adefe5996a38f94beb0d65f
Cleanup: imports
===================================================================
M space_view3d_pie_menus/__init__.py
M space_view3d_pie_menus/pie_align_menu/__init__.py
M space_view3d_pie_menus/pie_animation_menu/__init__.py
M space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
M space_view3d_pie_menus/pie_delete_menu/__init__.py
M space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
M space_view3d_pie_menus/pie_manipulator_menu/__init__.py
M space_view3d_pie_menus/pie_modes_menu/__init__.py
M space_view3d_pie_menus/pie_origin_cursor/__init__.py
M space_view3d_pie_menus/pie_pivot_point_menu/__init__.py
M space_view3d_pie_menus/pie_proportional_menu/__init__.py
M space_view3d_pie_menus/pie_save_open_menu/__init__.py
M space_view3d_pie_menus/pie_sculpt_menu/__init__.py
M space_view3d_pie_menus/pie_select_menu/__init__.py
M space_view3d_pie_menus/pie_shading_menu/__init__.py
M space_view3d_pie_menus/pie_snap_menu/__init__.py
M space_view3d_pie_menus/pie_views_numpad_menu/__init__.py
===================================================================
diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py
index eb5ce3a..7af91c1 100644
--- a/space_view3d_pie_menus/__init__.py
+++ b/space_view3d_pie_menus/__init__.py
@@ -15,14 +15,33 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# ##### END GPL LICENSE BLOCK #####
-# Contributed to by: meta-androcto, pitiwazou, chromoly, italic #
-import bpy
-from math import *
-from bpy.props import IntProperty, BoolProperty, FloatProperty, EnumProperty, PointerProperty, StringProperty, CollectionProperty
-from bpy.types import PropertyGroup
+# <pep8 compliant>
+
+bl_info = {
+ 'name': '3D Viewport Pie Menu',
+ 'author': 'meta-androcto, pitiwazou, chromoly, italic',
+ 'version': (1, 1, 3),
+ 'blender': (2, 7, 7),
+ 'location': '',
+ 'description': 'Pie Menu Activate',
+ 'warning': '',
+ "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
+ "Scripts/3D_interaction/viewport_pies",
+ "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
+ 'category': 'User Interface'
+ }
+
-import inspect
+import bpy
+from bpy.props import (
+ BoolProperty,
+ PointerProperty,
+ )
+from bpy.types import (
+ PropertyGroup,
+ AddonPreferences,
+ )
from . import pie_modes_menu
from . import pie_views_numpad_menu
@@ -42,20 +61,6 @@ from . import pie_animation_menu
from . import pie_save_open_menu
from . import pie_editor_switch_menu
-bl_info = {
- 'name': '3D Viewport Pie Menu',
- 'author': 'meta-androcto, pitiwazou',
- 'version': (1, 1, 3),
- 'blender': (2, 7, 7),
- 'location': '',
- 'description': 'Pie Menu Activate',
- 'warning': '',
- "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/"
- "Scripts/3D_interaction/viewport_pies",
- "tracker_url": "https://developer.blender.org/maniphest/task/edit/form/2/",
- 'category': 'User Interface'
- }
-
sub_modules = [
pie_modes_menu,
@@ -83,8 +88,10 @@ sub_modules.sort(
def _get_pref_class(mod):
+ import inspect
+
for obj in vars(mod).values():
- if inspect.isclass(obj) and issubclass(obj, bpy.types.PropertyGroup):
+ if inspect.isclass(obj) and issubclass(obj, PropertyGroup):
if hasattr(obj, 'bl_idname') and obj.bl_idname == mod.__name__:
return obj
@@ -101,7 +108,7 @@ def get_addon_preferences(name=''):
if mod.__name__.split('.')[-1] == name:
cls = _get_pref_class(mod)
if cls:
- prop = bpy.props.PointerProperty(type=cls)
+ prop = PointerProperty(type=cls)
setattr(UIToolsPreferences, name, prop)
bpy.utils.unregister_class(UIToolsPreferences)
bpy.utils.register_class(UIToolsPreferences)
@@ -139,17 +146,16 @@ def test_platform():
not in {'darwin', 'windows'})
-class UIToolsPreferences(bpy.types.AddonPreferences):
+class UIToolsPreferences(AddonPreferences):
bl_idname = __name__
- align_box_draw = bpy.props.BoolProperty(
+ align_box_draw = BoolProperty(
name='Box Draw',
description='If applied patch: patch/ui_layout_box.patch',
default=False)
def draw(self, context):
layout = self.layout
- """:type: bpy.types.UILayout"""
for mod in sub_modules:
mod_name = mod.__name__.split('.')[-1]
@@ -247,13 +253,13 @@ for mod in sub_modules:
unregister_submodule(mod)
return update
- prop = bpy.props.BoolProperty(
+ prop = BoolProperty(
name=info['name'],
description=info.get('description', ''),
update=gen_update(mod),
)
setattr(UIToolsPreferences, 'use_' + mod_name, prop)
- prop = bpy.props.BoolProperty()
+ prop = BoolProperty()
setattr(UIToolsPreferences, 'show_expanded_' + mod_name, prop)
classes = [
diff --git a/space_view3d_pie_menus/pie_align_menu/__init__.py b/space_view3d_pie_menus/pie_align_menu/__init__.py
index 2a58cbd..c42a6d6 100644
--- a/space_view3d_pie_menus/pie_align_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_align_menu/__init__.py
@@ -9,15 +9,11 @@ bl_info = {
"warning": "",
"wiki_url": "",
"category": "Edit Align Pie"
-}
+ }
import bpy
-import bmesh
-from ..utils import AddonPreferences, SpaceProperty
-from bpy.types import Menu, Header
-from bpy.props import IntProperty, FloatProperty, BoolProperty
-from mathutils import *
-import math
+from bpy.types import Menu
+
# Pie Align - Alt + X
diff --git a/space_view3d_pie_menus/pie_animation_menu/__init__.py b/space_view3d_pie_menus/pie_animation_menu/__init__.py
index 674616f..41d34cf 100644
--- a/space_view3d_pie_menus/pie_animation_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_animation_menu/__init__.py
@@ -9,12 +9,10 @@ bl_info = {
"warning": "",
"wiki_url": "",
"category": "Animation Pie"
-}
+ }
import bpy
-from ..utils import AddonPreferences, SpaceProperty
-from bpy.types import Menu, Header
-from bpy.props import IntProperty, FloatProperty, BoolProperty
+from bpy.types import Menu
# Pie Animation
diff --git a/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py b/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
index 9ee6208..af2dfe8 100644
--- a/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
@@ -9,12 +9,10 @@ bl_info = {
"warning": "",
"wiki_url": "",
"category": "Apply Transform Pie"
-}
+ }
import bpy
-from ..utils import AddonPreferences, SpaceProperty
-from bpy.types import Menu, Header
-from bpy.props import IntProperty, FloatProperty, BoolProperty
+from bpy.types import Menu
# Pie Apply Transforms - Ctrl + A
diff --git a/space_view3d_pie_menus/pie_delete_menu/__init__.py b/space_view3d_pie_menus/pie_delete_menu/__init__.py
index e405e7a..f5d1590 100644
--- a/space_view3d_pie_menus/pie_delete_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_delete_menu/__init__.py
@@ -9,12 +9,10 @@ bl_info = {
"warning": "",
"wiki_url": "",
"category": "Edit Delete Pie"
-}
+ }
import bpy
-from ..utils import AddonPreferences, SpaceProperty
-from bpy.types import Menu, Header
-from bpy.props import IntProperty, FloatProperty, BoolProperty
+from bpy.types import Menu
# Pie Delete - X
diff --git a/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py b/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
index ec6e0cb..b05193d 100644
--- a/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
@@ -9,12 +9,13 @@ bl_info = {
"warning": "",
"wiki_url": "",
"category": "Editor Switch Pie"
-}
+ }
import bpy
-from ..utils import AddonPreferences, SpaceProperty
-from bpy.types import Menu, Header
-from bpy.props import IntProperty, FloatProperty, BoolProperty, StringProperty
+from bpy.types import Menu
+from bpy.props import (
+ StringProperty,
+ )
class AreaPieMenu(bpy.types.Menu):
@@ -88,7 +89,7 @@ class SetAreaType(bpy.types.Operator):
bl_description = "Change Editor Type"
bl_options = {'REGISTER'}
- type = bpy.props.StringProperty(name="Area Type")
+ type = StringProperty(name="Area Type")
def execute(self, context):
context.area.type = self.type
diff --git a/space_view3d_pie_menus/pie_manipulator_menu/__init__.py b/space_view3d_pie_menus/pie_manipulator_menu/__init__.py
index b3d8a23..c22bd7b 100644
--- a/space_view3d_pie_menus/pie_manipulator_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_manipulator_menu/__init__.py
@@ -9,12 +9,10 @@ bl_info = {
"warning": "",
"wiki_url": "",
"category": "Manipulator Pie"
-}
+ }
import bpy
-from ..utils import AddonPreferences, SpaceProperty
-from bpy.types import Menu, Header
-from bpy.props import IntProperty, FloatProperty, BoolProperty
+from bpy.types import Menu
class ManipTranslate(bpy.types.Operator):
diff --git a/space_view3d_pie_menus/pie_modes_menu/__init__.py b/space_view3d_pie_menus/pie_modes_menu/__init__.py
index e7bfd6c..a8a9b91 100644
--- a/space_view3d_pie_menus/pie_modes_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_modes_menu/__init__.py
@@ -9,12 +9,10 @@ bl_info = {
"warning": "",
"wiki_url": "",
"category": "Mode Switch Pie"
-}
+ }
import bpy
-from ..utils import AddonPreferences, SpaceProperty
-from bpy.types import Menu, Header
-from bpy.props import IntProperty, FloatProperty, BoolProperty
+from bpy.types import Menu
# Define Class Object Mode
diff --git a/space_view3d_pie_menus/pie_origin_cursor/__init__.py b/space_view3d_pie_menus/pie_origin_cursor/__init__.py
index 5ed0944..2992223 100644
--- a/space_view3d_pie_menus/pie_origin_cursor/__init__.py
+++ b/space_view3d_pie_menus/pie_origin_cursor/__init__.py
@@ -9,12 +9,10 @@ bl_info = {
"warning": "",
"wiki_url": "",
"category": "Cursor/Origin Pie"
-}
+ }
import bpy
-from ..utils import AddonPreferences, SpaceProperty
-from bpy.types import Menu, Header
-from bpy.props import IntProperty, FloatProperty, BoolProperty
+from bpy.types import Menu
# SnapCursSelToCenter1 thanks to Isaac Weaver (wisaac) D1963
diff --git a/space_view3d_pie_menus/pie_pivot_point_menu/__init__.py b/space_view3d_pie_menus/pie_pivot_point_menu/__init__.py
index 325a1aa..d5df504 100644
--- a/space_view3d_pie_menus/pie_pivot_point_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_pivot_point_menu/__init__.py
@@ -9,12 +9,10 @@ bl_info = {
"warning": "",
"wiki_url": "",
"category": "Pivot Point Pie"
-}
+ }
import bpy
-from ..utils import AddonPreferences, SpaceProperty
-from bpy.types import Menu, Header
-from bpy.props import IntProperty, FloatProperty, BoolProperty
+from bpy.types import Menu
class VIEW3D_PIE_pivot(Menu):
diff --git a/space_view3d_pie_menus/pie_proportional_menu/__init__.py b/space_view3d_pie_menus/pie_proportional_menu/__init__.py
index 1844ed1..4be3c88 100644
--- a/space_view
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list