[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26472] trunk/blender/release/scripts: pep8 changes
Campbell Barton
ideasman42 at gmail.com
Sun Jan 31 15:46:30 CET 2010
Revision: 26472
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26472
Author: campbellbarton
Date: 2010-01-31 15:46:28 +0100 (Sun, 31 Jan 2010)
Log Message:
-----------
pep8 changes
Modified Paths:
--------------
trunk/blender/release/scripts/io/export_obj.py
trunk/blender/release/scripts/io/export_ply.py
trunk/blender/release/scripts/io/export_x3d.py
trunk/blender/release/scripts/io/netrender/__init__.py
trunk/blender/release/scripts/io/netrender/balancing.py
trunk/blender/release/scripts/io/netrender/master.py
trunk/blender/release/scripts/io/netrender/master_html.py
trunk/blender/release/scripts/io/netrender/slave.py
trunk/blender/release/scripts/io/netrender/ui.py
trunk/blender/release/scripts/io/netrender/utils.py
trunk/blender/release/scripts/modules/bpy/__init__.py
trunk/blender/release/scripts/modules/bpy/ops.py
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/modules/rna_prop_ui.py
trunk/blender/release/scripts/op/add_mesh_torus.py
trunk/blender/release/scripts/op/mesh.py
trunk/blender/release/scripts/op/object.py
trunk/blender/release/scripts/op/screen_play_rendered_anim.py
trunk/blender/release/scripts/op/uv.py
trunk/blender/release/scripts/op/wm.py
trunk/blender/release/scripts/templates/operator.py
trunk/blender/release/scripts/templates/operator_uv.py
trunk/blender/release/scripts/templates/panel_simple.py
trunk/blender/release/scripts/ui/properties_animviz.py
trunk/blender/release/scripts/ui/properties_data_armature.py
trunk/blender/release/scripts/ui/properties_data_camera.py
trunk/blender/release/scripts/ui/properties_data_curve.py
trunk/blender/release/scripts/ui/properties_data_mesh.py
trunk/blender/release/scripts/ui/properties_data_metaball.py
trunk/blender/release/scripts/ui/properties_data_modifier.py
trunk/blender/release/scripts/ui/properties_material.py
trunk/blender/release/scripts/ui/properties_object.py
trunk/blender/release/scripts/ui/properties_object_constraint.py
trunk/blender/release/scripts/ui/properties_render.py
trunk/blender/release/scripts/ui/properties_scene.py
trunk/blender/release/scripts/ui/properties_texture.py
trunk/blender/release/scripts/ui/properties_world.py
trunk/blender/release/scripts/ui/space_graph.py
trunk/blender/release/scripts/ui/space_image.py
trunk/blender/release/scripts/ui/space_info.py
trunk/blender/release/scripts/ui/space_node.py
trunk/blender/release/scripts/ui/space_userpref.py
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/release/scripts/ui/space_view3d_toolbar.py
Modified: trunk/blender/release/scripts/io/export_obj.py
===================================================================
--- trunk/blender/release/scripts/io/export_obj.py 2010-01-31 14:33:27 UTC (rev 26471)
+++ trunk/blender/release/scripts/io/export_obj.py 2010-01-31 14:46:28 UTC (rev 26472)
@@ -898,7 +898,7 @@
path = StringProperty(name="File Path", description="File path used for exporting the OBJ file", maxlen= 1024, default= "")
check_existing = BoolProperty(name="Check Existing", description="Check and warn on overwriting existing files", default=True, hidden=True)
-
+
# context group
use_selection = BoolProperty(name="Selection Only", description="", default= False)
use_all_scenes = BoolProperty(name="All Scenes", description="", default= False)
Modified: trunk/blender/release/scripts/io/export_ply.py
===================================================================
--- trunk/blender/release/scripts/io/export_ply.py 2010-01-31 14:33:27 UTC (rev 26471)
+++ trunk/blender/release/scripts/io/export_ply.py 2010-01-31 14:46:28 UTC (rev 26472)
@@ -281,7 +281,6 @@
use_uvs = BoolProperty(name="UVs", description="Exort the active UV layer", default=True)
use_colors = BoolProperty(name="Vertex Colors", description="Exort the active vertex color layer", default=True)
-
def poll(self, context):
return context.active_object != None
@@ -328,4 +327,3 @@
if __name__ == "__main__":
bpy.ops.export.ply(path="/tmp/test.ply")
-
Modified: trunk/blender/release/scripts/io/export_x3d.py
===================================================================
--- trunk/blender/release/scripts/io/export_x3d.py 2010-01-31 14:33:27 UTC (rev 26471)
+++ trunk/blender/release/scripts/io/export_x3d.py 2010-01-31 14:46:28 UTC (rev 26472)
@@ -626,7 +626,7 @@
texCoordList.append(uv)
j=j+1
texIndexList.append(-1)
-
+
if self.writingtexture == 0:
self.file.write("\n\t\t\ttexCoordIndex=\"")
texIndxStr=""
@@ -1228,7 +1228,7 @@
# to the class instance from the operator settings before calling.
path = StringProperty(name="File Path", description="File path used for exporting the X3D file", maxlen= 1024, default= "")
check_existing = BoolProperty(name="Check Existing", description="Check and warn on overwriting existing files", default=True, hidden=True)
-
+
apply_modifiers = BoolProperty(name="Apply Modifiers", description="Use transformed mesh data from each object.", default=True)
triangulate = BoolProperty(name="Triangulate", description="Triangulate quads.", default=False)
compress = BoolProperty(name="Compress", description="GZip the resulting file, requires a full python install.", default=False)
Modified: trunk/blender/release/scripts/io/netrender/__init__.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/__init__.py 2010-01-31 14:33:27 UTC (rev 26471)
+++ trunk/blender/release/scripts/io/netrender/__init__.py 2010-01-31 14:46:28 UTC (rev 26472)
@@ -34,4 +34,4 @@
init_file = ""
init_data = True
-init_address = True
\ No newline at end of file
+init_address = True
Modified: trunk/blender/release/scripts/io/netrender/balancing.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/balancing.py 2010-01-31 14:33:27 UTC (rev 26471)
+++ trunk/blender/release/scripts/io/netrender/balancing.py 2010-01-31 14:46:28 UTC (rev 26472)
@@ -24,7 +24,7 @@
class RatingRule:
def __init__(self):
self.enabled = True
-
+
def rate(self, job):
return 0
@@ -58,7 +58,7 @@
for rule in self.exceptions:
if id(rule) == rule_id:
return rule
-
+
return None
def addRule(self, rule):
@@ -129,7 +129,7 @@
def __init__(self, limit = 1):
super().__init__()
self.limit = limit
-
+
def setLimit(self, value):
self.limit = int(value)
@@ -175,7 +175,7 @@
def setLimit(self, value):
self.limit = float(value)
-
+
def str_limit(self):
return "more than %.0f%% of all slaves" % (self.limit * 100)
Modified: trunk/blender/release/scripts/io/netrender/master.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/master.py 2010-01-31 14:33:27 UTC (rev 26471)
+++ trunk/blender/release/scripts/io/netrender/master.py 2010-01-31 14:46:28 UTC (rev 26472)
@@ -75,9 +75,9 @@
self.last_update = 0
self.save_path = ""
self.files = [MRenderFile(rfile.filepath, rfile.index, rfile.start, rfile.end) for rfile in job_info.files]
-
+
self.resolution = None
-
+
def initInfo(self):
if not self.resolution:
self.resolution = tuple(getFileInfo(self.files[0].filepath, ["bpy.context.scene.render_data.resolution_x", "bpy.context.scene.render_data.resolution_y", "bpy.context.scene.render_data.resolution_percentage"]))
@@ -113,11 +113,11 @@
break
else:
self.status = JOB_FINISHED
-
+
def pause(self, status = None):
if self.status not in {JOB_PAUSED, JOB_QUEUED}:
- return
-
+ return
+
if status == None:
self.status = JOB_PAUSED if self.status == JOB_QUEUED else JOB_QUEUED
elif status:
@@ -238,7 +238,7 @@
if match:
job_id = match.groups()[0]
frame_number = int(match.groups()[1])
-
+
job = self.server.getJobID(job_id)
if job:
@@ -249,9 +249,9 @@
self.send_head(http.client.ACCEPTED)
elif frame.status == DONE:
self.server.stats("", "Sending result to client")
-
+
filename = job.save_path + "%04d" % frame_number + ".exr"
-
+
f = open(filename, 'rb')
self.send_head(content = "image/x-exr")
shutil.copyfileobj(f, self.wfile)
@@ -285,7 +285,7 @@
self.send_head(http.client.ACCEPTED)
elif frame.status == DONE:
filename = job.save_path + "%04d" % frame_number + ".exr"
-
+
thumbname = thumbnail(filename)
if thumbname:
@@ -527,7 +527,7 @@
rule.setLimit(limit)
except:
pass # invalid type
-
+
self.send_head()
# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
elif self.path == "/balance_enable":
@@ -537,7 +537,7 @@
rule = self.server.balancer.ruleByID(rule_id)
if rule:
rule.enabled = enabled
-
+
self.send_head()
# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
elif self.path.startswith("/cancel"):
@@ -545,13 +545,13 @@
if match:
length = int(self.headers['content-length'])
-
+
if length > 0:
info_map = eval(str(self.rfile.read(length), encoding='utf8'))
clear = info_map.get("clear", False)
else:
clear = False
-
+
job_id = match.groups()[0]
job = self.server.getJobID(job_id)
@@ -572,13 +572,13 @@
if match:
length = int(self.headers['content-length'])
-
+
if length > 0:
info_map = eval(str(self.rfile.read(length), encoding='utf8'))
status = info_map.get("status", None)
else:
status = None
-
+
job_id = match.groups()[0]
job = self.server.getJobID(job_id)
@@ -597,7 +597,7 @@
elif self.path == "/clear":
# cancel all jobs
length = int(self.headers['content-length'])
-
+
if length > 0:
info_map = eval(str(self.rfile.read(length), encoding='utf8'))
clear = info_map.get("clear", False)
@@ -963,10 +963,10 @@
def removeJob(self, job, clear_files = False):
self.jobs.remove(job)
self.jobs_map.pop(job.id)
-
+
if clear_files:
shutil.rmtree(job.save_path)
-
+
for slave in self.slaves:
if slave.job == job:
slave.job = None
Modified: trunk/blender/release/scripts/io/netrender/master_html.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/master_html.py 2010-01-31 14:33:27 UTC (rev 26471)
+++ trunk/blender/release/scripts/io/netrender/master_html.py 2010-01-31 14:46:28 UTC (rev 26472)
@@ -83,7 +83,7 @@
def endTable():
output("</table>")
-
+
def checkbox(title, value, script=""):
return """<input type="checkbox" title="%s" %s %s>""" % (title, "checked" if value else "", ("onclick=\"%s\"" % script) if script else "")
@@ -114,29 +114,29 @@
headerTable("type", "enabled", "description", "limit")
for rule in handler.server.balancer.rules:
- rowTable(
+ rowTable(
"rating",
checkbox("", rule.enabled, "balance_enable('%i', '%s')" % (id(rule), str(not rule.enabled))),
rule,
- rule.str_limit() +
+ rule.str_limit() +
"""<button title="edit limit" onclick="balance_edit('%i', '%s');">edit</button>""" % (id(rule), str(rule.limit)) if hasattr(rule, "limit") else " "
)
for rule in handler.server.balancer.priorities:
- rowTable(
+ rowTable(
"priority",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list