1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pep8 cleanup

Browse Source
This commit is contained in:
Campbell Barton 2011-02-25 16:06:14 +00:00
parent 24685d3967
commit b25db7c8cb
5 changed files with 109 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/modules/add_object_utils.py
View File

@ -82,7 +82,7 @@ def object_data_add(context, obdata, operator=None):
obj_new.matrix_world = add_object_align_init(context, operator) obj_new.matrix_world = add_object_align_init(context, operator)
obj_act = scene.objects.active obj_act = scene.objects.active
# XXX # XXX
# caused because entering editmodedoes not add a empty undo slot! # caused because entering editmodedoes not add a empty undo slot!
if context.user_preferences.edit.use_enter_edit_mode: if context.user_preferences.edit.use_enter_edit_mode:

174
release/scripts/modules/addon_utils.py
View File

@ -19,117 +19,117 @@
# <pep8 compliant> # <pep8 compliant>
__all__ = ( __all__ = (
"paths", "paths",
"modules", "modules",
"check", "check",
"enable", "enable",
"disable", "disable",
"reset_all", "reset_all",
"module_bl_info", "module_bl_info",
) )
import bpy as _bpy import bpy as _bpy
def paths(): def paths():
# RELEASE SCRIPTS: official scripts distributed in Blender releases # RELEASE SCRIPTS: official scripts distributed in Blender releases
paths = _bpy.utils.script_paths("addons") paths = _bpy.utils.script_paths("addons")
# CONTRIB SCRIPTS: good for testing but not official scripts yet # CONTRIB SCRIPTS: good for testing but not official scripts yet
# if folder addons_contrib/ exists, scripts in there will be loaded too # if folder addons_contrib/ exists, scripts in there will be loaded too
paths += _bpy.utils.script_paths("addons_contrib") paths += _bpy.utils.script_paths("addons_contrib")
# EXTERN SCRIPTS: external projects scripts # EXTERN SCRIPTS: external projects scripts
# if folder addons_extern/ exists, scripts in there will be loaded too # if folder addons_extern/ exists, scripts in there will be loaded too
paths += _bpy.utils.script_paths("addons_extern") paths += _bpy.utils.script_paths("addons_extern")
return paths return paths
def modules(module_cache): def modules(module_cache):
import os import os
import sys import sys
import time import time
path_list = paths() path_list = paths()
# fake module importing # fake module importing
def fake_module(mod_name, mod_path, speedy=True): def fake_module(mod_name, mod_path, speedy=True):
if _bpy.app.debug: if _bpy.app.debug:
print("fake_module", mod_path, mod_name) print("fake_module", mod_path, mod_name)
import ast import ast
ModuleType = type(ast) ModuleType = type(ast)
file_mod = open(mod_path, "r", encoding='UTF-8') file_mod = open(mod_path, "r", encoding='UTF-8')
if speedy: if speedy:
lines = [] lines = []
line_iter = iter(file_mod) line_iter = iter(file_mod)
l = "" l = ""
while not l.startswith("bl_info"): while not l.startswith("bl_info"):
l = line_iter.readline() l = line_iter.readline()
if len(l) == 0: if len(l) == 0:
break break
while l.rstrip(): while l.rstrip():
lines.append(l) lines.append(l)
l = line_iter.readline() l = line_iter.readline()
data = "".join(lines) data = "".join(lines)
else: else:
data = file_mod.read() data = file_mod.read()
file_mod.close() file_mod.close()
try: try:
ast_data = ast.parse(data, filename=mod_path) ast_data = ast.parse(data, filename=mod_path)
except: except:
print("Syntax error 'ast.parse' can't read %r" % mod_path) print("Syntax error 'ast.parse' can't read %r" % mod_path)
import traceback import traceback
traceback.print_exc() traceback.print_exc()
ast_data = None ast_data = None
body_info = None body_info = None
if ast_data: if ast_data:
for body in ast_data.body: for body in ast_data.body:
if body.__class__ == ast.Assign: if body.__class__ == ast.Assign:
if len(body.targets) == 1: if len(body.targets) == 1:
if getattr(body.targets[0], "id", "") == "bl_info": if getattr(body.targets[0], "id", "") == "bl_info":
body_info = body body_info = body
break break
if body_info: if body_info:
mod = ModuleType(mod_name) mod = ModuleType(mod_name)
mod.bl_info = ast.literal_eval(body.value) mod.bl_info = ast.literal_eval(body.value)
mod.__file__ = mod_path mod.__file__ = mod_path
mod.__time__ = os.path.getmtime(mod_path) mod.__time__ = os.path.getmtime(mod_path)
return mod return mod
else: else:
return None return None
modules_stale = set(module_cache.keys()) modules_stale = set(module_cache.keys())
for path in path_list: for path in path_list:
for mod_name, mod_path in _bpy.path.module_names(path): for mod_name, mod_path in _bpy.path.module_names(path):
modules_stale -= {mod_name} modules_stale -= {mod_name}
mod = module_cache.get(mod_name) mod = module_cache.get(mod_name)
if mod: if mod:
if mod.__time__ != os.path.getmtime(mod_path): if mod.__time__ != os.path.getmtime(mod_path):
print("reloading addon:", mod_name, mod.__time__, os.path.getmtime(mod_path), mod_path) print("reloading addon:", mod_name, mod.__time__, os.path.getmtime(mod_path), mod_path)
del module_cache[mod_name] del module_cache[mod_name]
mod = None mod = None
if mod is None: if mod is None:
mod = fake_module(mod_name, mod_path) mod = fake_module(mod_name, mod_path)
if mod: if mod:
module_cache[mod_name] = mod module_cache[mod_name] = mod
# just incase we get stale modules, not likely # just incase we get stale modules, not likely
for mod_stale in modules_stale: for mod_stale in modules_stale:
del module_cache[mod_stale] del module_cache[mod_stale]
del modules_stale del modules_stale
mod_list = list(module_cache.values()) mod_list = list(module_cache.values())
mod_list.sort(key=lambda mod: (mod.bl_info['category'], mod.bl_info['name'])) mod_list.sort(key=lambda mod: (mod.bl_info['category'], mod.bl_info['name']))
return mod_list return mod_list
def check(module_name): def check(module_name):

1
release/scripts/modules/bpy/utils.py
View File

@ -36,6 +36,7 @@ import sys as _sys
import addon_utils import addon_utils
def _test_import(module_name, loaded_modules): def _test_import(module_name, loaded_modules):
import traceback import traceback
import time import time

16
release/scripts/ui/properties_material.py
View File

@ -361,10 +361,10 @@ class MATERIAL_PT_transp(MaterialButtonsPanel, bpy.types.Panel):
mat = context.material mat = context.material
engine = context.scene.render.engine engine = context.scene.render.engine
return check_material(mat) and (mat.type in ('SURFACE', 'WIRE')) and (engine in cls.COMPAT_ENGINES) return check_material(mat) and (mat.type in ('SURFACE', 'WIRE')) and (engine in cls.COMPAT_ENGINES)
def draw_header(self, context): def draw_header(self, context):
mat = context.material mat = context.material
if simple_material(mat): if simple_material(mat):
self.layout.prop(mat, "use_transparency", text="") self.layout.prop(mat, "use_transparency", text="")
@ -374,14 +374,14 @@ class MATERIAL_PT_transp(MaterialButtonsPanel, bpy.types.Panel):
base_mat = context.material base_mat = context.material
mat = active_node_mat(context.material) mat = active_node_mat(context.material)
rayt = mat.raytrace_transparency rayt = mat.raytrace_transparency
if simple_material(base_mat): if simple_material(base_mat):
row = layout.row() row = layout.row()
row.active = mat.use_transparency row.active = mat.use_transparency
row.prop(mat, "transparency_method", expand=True) row.prop(mat, "transparency_method", expand=True)
split = layout.split() split = layout.split()
col = split.column() col = split.column()
col.prop(mat, "alpha") col.prop(mat, "alpha")
row = col.row() row = col.row()
@ -698,7 +698,7 @@ class MATERIAL_PT_options(MaterialButtonsPanel, bpy.types.Panel):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
base_mat = context.material base_mat = context.material
mat = active_node_mat(base_mat) mat = active_node_mat(base_mat)
@ -746,7 +746,7 @@ class MATERIAL_PT_shadow(MaterialButtonsPanel, bpy.types.Panel):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
base_mat = context.material base_mat = context.material
mat = active_node_mat(base_mat) mat = active_node_mat(base_mat)
@ -800,7 +800,7 @@ class MATERIAL_PT_transp_game(MaterialButtonsPanel, bpy.types.Panel):
row = layout.row() row = layout.row()
row.active = mat.use_transparency row.active = mat.use_transparency
row.prop(mat, "transparency_method", expand=True) row.prop(mat, "transparency_method", expand=True)
layout.prop(mat, "alpha") layout.prop(mat, "alpha")
@ -897,7 +897,7 @@ class MATERIAL_PT_volume_lighting(VolumeButtonsPanel, bpy.types.Panel):
class MATERIAL_PT_volume_transp(VolumeButtonsPanel, bpy.types.Panel): class MATERIAL_PT_volume_transp(VolumeButtonsPanel, bpy.types.Panel):
bl_label = "Transparency" bl_label = "Transparency"
COMPAT_ENGINES = {'BLENDER_RENDER'} COMPAT_ENGINES = {'BLENDER_RENDER'}
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
mat = context.material mat = context.material

24
release/scripts/ui/space_image.py
View File

@ -157,24 +157,24 @@ class IMAGE_MT_image_invert(bpy.types.Menu):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
op = layout.operator("image.invert", text="Invert Image Colors"); op = layout.operator("image.invert", text="Invert Image Colors")
op.invert_r = True; op.invert_r = True
op.invert_g = True; op.invert_g = True
op.invert_b = True; op.invert_b = True
layout.separator() layout.separator()
op = layout.operator("image.invert", text="Invert Red Channel"); op = layout.operator("image.invert", text="Invert Red Channel")
op.invert_r = True; op.invert_r = True
op = layout.operator("image.invert", text="Invert Green Channel"); op = layout.operator("image.invert", text="Invert Green Channel")
op.invert_g = True; op.invert_g = True
op = layout.operator("image.invert", text="Invert Blue Channel"); op = layout.operator("image.invert", text="Invert Blue Channel")
op.invert_b = True; op.invert_b = True
op = layout.operator("image.invert", text="Invert Alpha Channel"); op = layout.operator("image.invert", text="Invert Alpha Channel")
op.invert_a = True; op.invert_a = True
class IMAGE_MT_uvs_showhide(bpy.types.Menu): class IMAGE_MT_uvs_showhide(bpy.types.Menu):