[Bf-blender-cvs] [b66aa0b0a6b] master: Cleanup: pep8
Campbell Barton
noreply at git.blender.org
Tue Jul 3 06:55:19 CEST 2018
Commit: b66aa0b0a6b123e833d4038a77a5d3f04c37a9a0
Author: Campbell Barton
Date: Tue Jul 3 06:27:53 2018 +0200
Branches: master
https://developer.blender.org/rBb66aa0b0a6b123e833d4038a77a5d3f04c37a9a0
Cleanup: pep8
===================================================================
M release/scripts/modules/addon_utils.py
M release/scripts/modules/bl_app_override/__init__.py
M release/scripts/modules/bl_i18n_utils/merge_po.py
M release/scripts/modules/bl_previews_utils/bl_previews_render.py
M release/scripts/modules/blend_render_info.py
M release/scripts/modules/bpy/ops.py
M release/scripts/modules/bpy/path.py
M release/scripts/modules/bpy_extras/__init__.py
M release/scripts/modules/bpy_extras/anim_utils.py
M release/scripts/modules/bpy_extras/image_utils.py
M release/scripts/modules/bpy_extras/io_utils.py
M release/scripts/modules/bpy_extras/keyconfig_utils.py
M release/scripts/modules/bpy_extras/mesh_utils.py
M release/scripts/modules/bpy_extras/object_utils.py
M release/scripts/modules/bpyml.py
M release/scripts/modules/console/complete_import.py
M release/scripts/modules/console_python.py
M release/scripts/modules/console_shell.py
M release/scripts/modules/graphviz_export.py
M release/scripts/modules/keyingsets_utils.py
M release/scripts/modules/nodeitems_utils.py
M release/scripts/modules/rna_keymap_ui.py
M release/scripts/startup/bl_operators/bmesh/find_adjacent.py
M release/scripts/startup/keyingsets_builtins.py
M release/scripts/startup/nodeitems_builtins.py
===================================================================
diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py
index 97fc45189f2..c4097bed33b 100644
--- a/release/scripts/modules/addon_utils.py
+++ b/release/scripts/modules/addon_utils.py
@@ -209,6 +209,8 @@ def modules(module_cache=addons_fake_modules, *, refresh=True):
)
)
return mod_list
+
+
modules._is_first = True
diff --git a/release/scripts/modules/bl_app_override/__init__.py b/release/scripts/modules/bl_app_override/__init__.py
index f17878b4822..2104b10bf85 100644
--- a/release/scripts/modules/bl_app_override/__init__.py
+++ b/release/scripts/modules/bl_app_override/__init__.py
@@ -172,6 +172,7 @@ def ui_draw_filter_register(
class Wrapper(cls_real):
__slots__ = ()
+
def __getattribute__(self, attr):
if attr == "layout":
return UILayout_Fake(self_real.layout)
diff --git a/release/scripts/modules/bl_i18n_utils/merge_po.py b/release/scripts/modules/bl_i18n_utils/merge_po.py
index ecb26123999..7e3c8a42b17 100755
--- a/release/scripts/modules/bl_i18n_utils/merge_po.py
+++ b/release/scripts/modules/bl_i18n_utils/merge_po.py
@@ -43,14 +43,17 @@ else:
# 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=
- "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"
- "The fuzzy flag is removed if necessary.\n"
- "All other comments are never modified.\n"
- "Commented messages in dst will always remain commented, and commented messages are never merged "
- "from sources.")
+ 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"
+ "The fuzzy flag is removed if necessary.\n"
+ "All other comments are never modified.\n"
+ "Commented messages in dst will always remain commented, and commented messages are never merged "
+ "from sources."
+ ),
+ )
parser.add_argument('-s', '--stats', action="store_true", help="Show statistics info.")
parser.add_argument('-r', '--replace', action="store_true",
help="Replace existing messages of same \"level\" already in dest po.")
diff --git a/release/scripts/modules/bl_previews_utils/bl_previews_render.py b/release/scripts/modules/bl_previews_utils/bl_previews_render.py
index 32266e972bb..4159121cd90 100644
--- a/release/scripts/modules/bl_previews_utils/bl_previews_render.py
+++ b/release/scripts/modules/bl_previews_utils/bl_previews_render.py
@@ -442,7 +442,7 @@ def do_previews(do_objects, do_groups, do_scenes, do_data_intern):
if not has_camera:
# We had to add a temp camera, now we need to place it to see interesting objects!
objects = tuple((ob.name, ob.library.filepath if ob.library else None) for ob in scene.objects
- if (not ob.hide_render) and (ob.type in OBJECT_TYPES_RENDER))
+ if (not ob.hide_render) and (ob.type in OBJECT_TYPES_RENDER))
preview_render_do(render_context, 'scenes', scene.name, objects)
diff --git a/release/scripts/modules/blend_render_info.py b/release/scripts/modules/blend_render_info.py
index 30c3ed2388b..3b4fb255005 100755
--- a/release/scripts/modules/blend_render_info.py
+++ b/release/scripts/modules/blend_render_info.py
@@ -98,5 +98,6 @@ def main():
for value in read_blend_rend_chunk(arg):
print("%d %d %s" % value)
+
if __name__ == '__main__':
main()
diff --git a/release/scripts/modules/bpy/ops.py b/release/scripts/modules/bpy/ops.py
index d3d9255123b..7c5c76ffdbe 100644
--- a/release/scripts/modules/bpy/ops.py
+++ b/release/scripts/modules/bpy/ops.py
@@ -225,4 +225,5 @@ class BPyOpsSubModOp:
return ("<function bpy.ops.%s.%s at 0x%x'>" %
(self._module, self._func, id(self)))
+
ops_fake_module = BPyOps()
diff --git a/release/scripts/modules/bpy/path.py b/release/scripts/modules/bpy/path.py
index a88e60d0022..6af78bbb4c0 100644
--- a/release/scripts/modules/bpy/path.py
+++ b/release/scripts/modules/bpy/path.py
@@ -183,6 +183,8 @@ def clean_name(name, replace="_"):
trans = maketrans_init()
return name.translate(trans)
+
+
clean_name._trans_cache = {}
@@ -223,6 +225,7 @@ def display_name(name):
name = _clean_utf8(name)
return name
+
def display_name_to_filepath(name):
"""
Performs the reverse of display_name using literal versions of characters
diff --git a/release/scripts/modules/bpy_extras/__init__.py b/release/scripts/modules/bpy_extras/__init__.py
index c8d12070de8..d2578e1812a 100644
--- a/release/scripts/modules/bpy_extras/__init__.py
+++ b/release/scripts/modules/bpy_extras/__init__.py
@@ -30,4 +30,4 @@ __all__ = (
"keyconfig_utils",
"mesh_utils",
"view3d_utils",
- )
+)
diff --git a/release/scripts/modules/bpy_extras/anim_utils.py b/release/scripts/modules/bpy_extras/anim_utils.py
index 75d2065a3d1..7216add2c2c 100644
--- a/release/scripts/modules/bpy_extras/anim_utils.py
+++ b/release/scripts/modules/bpy_extras/anim_utils.py
@@ -174,7 +174,7 @@ def bake_action_iter(
# Bendy Bones
if pbone.bone.bbone_segments > 1:
- bbones[name] = {bb_prop : getattr(pbone, bb_prop) for bb_prop in BBONE_PROPS}
+ bbones[name] = {bb_prop: getattr(pbone, bb_prop) for bb_prop in BBONE_PROPS}
return matrix, bbones
if do_parents_clear:
diff --git a/release/scripts/modules/bpy_extras/image_utils.py b/release/scripts/modules/bpy_extras/image_utils.py
index f772aab2b14..49fce7d27c7 100644
--- a/release/scripts/modules/bpy_extras/image_utils.py
+++ b/release/scripts/modules/bpy_extras/image_utils.py
@@ -20,7 +20,7 @@
__all__ = (
"load_image",
- )
+)
# limited replacement for BPyImage.comprehensiveImageLoad
diff --git a/release/scripts/modules/bpy_extras/io_utils.py b/release/scripts/modules/bpy_extras/io_utils.py
index 8a516f12b17..e2c2e4c9b93 100644
--- a/release/scripts/modules/bpy_extras/io_utils.py
+++ b/release/scripts/modules/bpy_extras/io_utils.py
@@ -32,7 +32,7 @@ __all__ = (
"path_reference_copy",
"path_reference_mode",
"unique_name"
- )
+)
import bpy
from bpy.props import (
@@ -53,23 +53,23 @@ def _check_axis_conversion(op):
class ExportHelper:
filepath = StringProperty(
- name="File Path",
- description="Filepath used for exporting the file",
- maxlen=1024,
- subtype='FILE_PATH',
- )
+ name="File Path",
+ description="Filepath used for exporting the file",
+ maxlen=1024,
+ subtype='FILE_PATH',
+ )
check_existing = BoolProperty(
- name="Check Existing",
- description="Check and warn on overwriting existing files",
- default=True,
- options={'HIDDEN'},
- )
+ name="Check Existing",
+ description="Check and warn on overwriting existing files",
+ default=True,
+ options={'HIDDEN'},
+ )
# needed for mix-ins
order = [
"filepath",
"check_existing",
- ]
+ ]
# subclasses can override with decorator
# True == use ext, False == no ext, None == do nothing.
@@ -113,16 +113,16 @@ class ExportHelper:
class ImportHelper:
filepath = StringProperty(
- name="File Path",
- description="Filepath used for importing the file",
- maxlen=1024,
- subtype='FILE_PATH',
- )
+ name="File Path",
+ description="Filepath used for importing the file",
+ maxlen=1024,
+ subtype='FILE_PATH',
+ )
# needed for mix-ins
order = [
"filepath",
- ]
+ ]
def invoke(self, context, event):
context.window_manager.fileselect_add(self)
@@ -138,43 +138,45 @@ def orientation_helper_factory(name, axis_forward='Y', axis_up='Z'):
def _update_axis_forward(self, context):
if self.axis_forward[-1] == self.axis_up[-1]:
self.axis_up = (self.axis_up[0:-1] +
- 'XYZ'[('XYZ'.index(self.axis_up[-1]) + 1) % 3])
+ 'XYZ'[('XYZ'.index(self.axis_up[-1]) + 1) % 3])
members['axis_forward'] = EnumProperty(
- name="Forward",
- items=(('X', "X Forward", ""),
- ('Y', "Y Forward", ""),
- ('Z', "Z Forward", ""),
- ('-X', "-X Forward", ""),
- ('-Y', "-Y Forward", ""),
- ('-Z', "-Z Forward", ""),
- ),
- default=axis_forward,
- update=_update_axis_forward,
- )
+ name="Forward",
+ items=(
+ ('X', "X Forward", ""),
+ ('Y', "Y Forward", ""),
+ ('Z', "Z Forward", ""),
+ ('-X', "-X Forward", ""),
+ ('-Y', "-Y Forward", ""),
+ ('-Z', "-Z Forward", ""),
+ ),
+ default=axis_forward,
+ update=_update_axis_forward,
+ )
def _update_axis_up(self, context):
if self.axis_up[-1] == self.axis_forward[-1]:
self.axis_forward = (self.axis_forward[0:-1] +
- 'XYZ'[('XYZ'.index(self.axis_forward[-1]) + 1) % 3])
+ 'XYZ'[('XYZ'.index(self.axis_forward[-1]) + 1) % 3])
members['axis_up'] = EnumProperty(
- name="Up",
- items=(('X', "X Up", ""),
- ('Y', "Y Up", ""),
- ('Z', "Z Up", ""),
- ('-X',
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list