Cleanup: pep8

This commit is contained in:
2016-02-01 00:47:10 +11:00
parent 0f3f117311
commit d924998d3e
24 changed files with 56 additions and 49 deletions

View File

@@ -329,7 +329,7 @@ authz_cfg = authz.Authz(
)
c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
#c['status'].append(html.WebStatus(http_port=8010))
# c['status'].append(html.WebStatus(http_port=8010))
# PROJECT IDENTITY

View File

@@ -278,7 +278,6 @@ def main():
# Write a 'sed' script, useful if we get a lot of these
# print("sed '%dd' '%s' > '%s.tmp' ; mv '%s.tmp' '%s'" % (i, cf, cf, cf, cf))
if is_err:
raise Exception("CMake referenecs missing files, aborting!")
del is_err

View File

@@ -81,7 +81,6 @@ def create_nb_project_main():
# be tricky, get the project name from git if we can!
PROJECT_NAME = project_name_get()
make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
make_exe_basename = os.path.basename(make_exe)

View File

@@ -63,7 +63,6 @@ class OffScreenDraw(bpy.types.Operator):
render.pixel_aspect_y,
)
offscreen.draw_view3d(
scene,
context.space_data,

View File

@@ -180,7 +180,7 @@ def main():
l = "None,"
b[i] = l
#for l in b:
# for l in b:
# print(l)
text = "\n".join(b)

View File

@@ -538,7 +538,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
cls.rolling_shutter_duration = FloatProperty(
name="Rolling Shutter Duration",
description="Scanline \"exposure\" time for the rolling shutter effect",
default = 0.1,
default=0.1,
min=0.0, max=1.0,
)

View File

@@ -168,7 +168,7 @@ class CyclesRender_PT_sampling(CyclesButtonsPanel, Panel):
sub.prop(cscene, "sample_clamp_direct")
sub.prop(cscene, "sample_clamp_indirect")
if cscene.progressive == 'PATH' or use_branched_path(context) == False:
if cscene.progressive == 'PATH' or use_branched_path(context) is False:
col = split.column()
sub = col.column(align=True)
sub.label(text="Samples:")

View File

@@ -69,16 +69,20 @@ def abspath(path, start=None, library=None):
if isinstance(path, bytes):
if path.startswith(b"//"):
if library:
start = _os.path.dirname(abspath(_getattr_bytes(library, "filepath")))
return _os.path.join(_os.path.dirname(_getattr_bytes(_bpy.data, "filepath"))
start = _os.path.dirname(
abspath(_getattr_bytes(library, "filepath")))
return _os.path.join(
_os.path.dirname(_getattr_bytes(_bpy.data, "filepath"))
if start is None else start,
path[2:],
)
else:
if path.startswith("//"):
if library:
start = _os.path.dirname(abspath(library.filepath))
return _os.path.join(_os.path.dirname(_bpy.data.filepath)
start = _os.path.dirname(
abspath(library.filepath))
return _os.path.join(
_os.path.dirname(_bpy.data.filepath)
if start is None else start,
path[2:],
)

View File

@@ -62,10 +62,12 @@ def load_image(imagepath,
:type convert_callback: function
:arg relpath: If not None, make the file relative to this path.
:type relpath: None or string
:arg check_existing: If true, returns already loaded image datablock if possible
:arg check_existing: If true,
returns already loaded image datablock if possible
(based on file path).
:type check_existing: bool
:arg force_reload: If true, force reloading of image (only useful when `check_existing`
:arg force_reload: If true,
force reloading of image (only useful when `check_existing`
is also enabled).
:type force_reload: bool
:return: an image or None

View File

@@ -137,7 +137,8 @@ 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]
self.axis_up = (self.axis_up[0:-1] +
'XYZ'[('XYZ'.index(self.axis_up[-1]) + 1) % 3])
members['axis_forward'] = EnumProperty(
name="Forward",
@@ -154,7 +155,8 @@ def orientation_helper_factory(name, axis_forward='Y', axis_up='Z'):
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]
self.axis_forward = (self.axis_forward[0:-1] +
'XYZ'[('XYZ'.index(self.axis_forward[-1]) + 1) % 3])
members['axis_up'] = EnumProperty(
name="Up",

View File

@@ -208,7 +208,7 @@ class _GenericBone:
@property
def basename(self):
"""The name of this bone before any '.' character"""
#return self.name.rsplit(".", 1)[0]
# return self.name.rsplit(".", 1)[0]
return self.name.split(".")[0]
@property

View File

@@ -40,7 +40,6 @@ def write_sysinfo(filepath):
r = r[1:-1]
return r
output = open(filepath, 'w', encoding="utf-8")
header = "= Blender %s System Information =\n" % bpy.app.version_string

View File

@@ -440,7 +440,7 @@ class ConstraintButtonsPanel:
self.space_template(layout, con)
#def SCRIPT(self, context, layout, con):
# def SCRIPT(self, context, layout, con):
def ACTION(self, context, layout, con):
self.target_template(layout, con)

View File

@@ -294,7 +294,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
row.prop(md, "use_symmetry")
row.prop(md, "symmetry_axis", text="")
elif decimate_type == 'UNSUBDIV':
layout.prop(md, "iterations")
layout_info = layout

View File

@@ -394,7 +394,7 @@ class GPENCIL_PIE_sculpt(Menu):
# W - Launch Sculpt Mode
col = pie.column()
#col.label("Tool:")
# col.label("Tool:")
col.prop(settings, "tool", text="")
col.operator("gpencil.brush_paint", text="Sculpt", icon='SCULPTMODE_HLT')

View File

@@ -242,7 +242,7 @@ class TEXTURE_PT_preview(TextureButtonsPanel, Panel):
else:
layout.template_preview(tex, slot=slot)
#Show Alpha Button for Brush Textures, see #29502
# Show Alpha Button for Brush Textures, see #29502
if context.space_data.texture_context == 'BRUSH':
layout.prop(tex, "use_preview_alpha")
@@ -498,7 +498,7 @@ class TEXTURE_PT_image_sampling(TextureTypePanel, Panel):
col = split.column()
#Only for Material based textures, not for Lamp/World...
# Only for Material based textures, not for Lamp/World...
if slot and isinstance(idblock, Material):
col.prop(tex, "use_normal_map")
row = col.row()
@@ -533,7 +533,7 @@ class TEXTURE_PT_image_sampling(TextureTypePanel, Panel):
col = split.column()
#Only for Material based textures, not for Lamp/World...
# Only for Material based textures, not for Lamp/World...
if slot and isinstance(idblock, Material):
col.prop(tex, "use_normal_map")
row = col.row()
@@ -590,7 +590,7 @@ class TEXTURE_PT_image_mapping(TextureTypePanel, Panel):
split = layout.split()
col = split.column(align=True)
#col.prop(tex, "crop_rectangle")
# col.prop(tex, "crop_rectangle")
col.label(text="Crop Minimum:")
col.prop(tex, "crop_min_x", text="X")
col.prop(tex, "crop_min_y", text="Y")
@@ -777,7 +777,7 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel, Panel):
elif vd.file_format == 'IMAGE_SEQUENCE':
layout.template_ID(tex, "image", open="image.open")
layout.template_image(tex, "image", tex.image_user, compact=True)
#layout.prop(vd, "frame_duration")
# layout.prop(vd, "frame_duration")
if vd.file_format in {'BLENDER_VOXEL', 'RAW_8BIT'}:
layout.prop(vd, "use_still_frame")

View File

@@ -1135,6 +1135,7 @@ class CLIP_PT_tools_grease_pencil_draw(GreasePencilDrawingToolsPanel, Panel):
class CLIP_PT_tools_grease_pencil_edit(GreasePencilStrokeEditPanel, Panel):
bl_space_type = 'CLIP_EDITOR'
# Grease Pencil stroke sculpting tools
class CLIP_PT_tools_grease_pencil_sculpt(GreasePencilStrokeSculptPanel, Panel):
bl_space_type = 'CLIP_EDITOR'

View File

@@ -728,6 +728,7 @@ class IMAGE_PT_paint(Panel, ImagePaintPanel):
toolsettings = context.tool_settings.image_paint
return sima.show_paint
class IMAGE_PT_tools_brush_overlay(BrushButtonsPanel, Panel):
bl_label = "Overlay"
bl_options = {'DEFAULT_CLOSED'}

View File

@@ -489,6 +489,7 @@ class NODE_PT_tools_grease_pencil_edit(GreasePencilStrokeEditPanel, Panel):
bl_space_type = 'NODE_EDITOR'
bl_region_type = 'TOOLS'
# Grease Pencil stroke sculpting tools
class NODE_PT_tools_grease_pencil_sculpt(GreasePencilStrokeSculptPanel, Panel):
bl_space_type = 'NODE_EDITOR'

View File

@@ -279,11 +279,11 @@ class SEQUENCER_MT_change(Menu):
stype = strip.type
if stype == 'IMAGE':
prop.filter_image = True;
prop.filter_image = True
elif stype == 'MOVIE':
prop.filter_movie = True;
prop.filter_movie = True
elif stype == 'SOUND':
prop.filter_sound = True;
prop.filter_sound = True
class SEQUENCER_MT_frame(Menu):
@@ -1142,6 +1142,7 @@ class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel):
col.prop(mod, "offset")
col.prop(mod, "gamma")
class SEQUENCER_PT_grease_pencil(GreasePencilDataPanel, SequencerButtonsPanel_Output, Panel):
bl_space_type = 'SEQUENCE_EDITOR'
bl_region_type = 'UI'

View File

@@ -816,8 +816,8 @@ def test_cube_shell(context, test):
def main():
print("Calling main!")
#render_gl(bpy.context, "/testme")
#ctx_clear_scene()
# render_gl(bpy.context, "/testme")
# ctx_clear_scene()
context = bpy.context

View File

@@ -285,8 +285,8 @@ def run_ops(operators, setup_func=None, reset=True):
try:
op(mode)
except:
#import traceback
#traceback.print_exc()
# import traceback
# traceback.print_exc()
pass
if USE_ATTRSET:
@@ -445,7 +445,7 @@ def main():
filter_op_list(operators)
# for testing, mix the list up.
#operators.reverse()
# operators.reverse()
if USE_RANDOM:
import random

View File

@@ -54,7 +54,7 @@ def parse_rst_py(filepath):
for i, line in enumerate(f):
line_strip = line.lstrip()
# ^\.\.\s[a-zA-Z09\-]+::.*$
#if line.startswith(".. "):
# if line.startswith(".. "):
march = re_prefix.match(line_strip)
if march: