[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35810] trunk/blender: pep8 cleanup
Campbell Barton
ideasman42 at gmail.com
Sun Mar 27 07:23:15 CEST 2011
Revision: 35810
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35810
Author: campbellbarton
Date: 2011-03-27 05:23:14 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
pep8 cleanup
Modified Paths:
--------------
trunk/blender/build_files/buildbot/master.cfg
trunk/blender/build_files/buildbot/master_unpack.py
trunk/blender/build_files/buildbot/slave_compile.py
trunk/blender/build_files/buildbot/slave_pack.py
trunk/blender/build_files/buildbot/slave_test.py
trunk/blender/build_files/cmake/cmake_qtcreator_project.py
trunk/blender/build_files/package_spec/build_archive.py
trunk/blender/doc/python_api/sphinx_doc_gen.py
trunk/blender/release/scripts/modules/animsys_refactor.py
trunk/blender/release/scripts/modules/bpyml.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/tests/pep8.py
Modified: trunk/blender/build_files/buildbot/master.cfg
===================================================================
--- trunk/blender/build_files/buildbot/master.cfg 2011-03-27 03:29:27 UTC (rev 35809)
+++ trunk/blender/build_files/buildbot/master.cfg 2011-03-27 05:23:14 UTC (rev 35810)
@@ -1,6 +1,8 @@
# -*- python -*-
# ex: set syntax=python:
+# <pep8 compliant>
+
# Dictionary that the buildmaster pays attention to.
c = BuildmasterConfig = {}
@@ -36,12 +38,12 @@
# only take place on one slave.
from buildbot.process.factory import BuildFactory
-from buildbot.steps.source import SVN
+from buildbot.steps.source import SVN
from buildbot.steps.shell import ShellCommand
from buildbot.steps.shell import Compile
from buildbot.steps.shell import Test
from buildbot.steps.transfer import FileUpload
-from buildbot.steps.transfer import FileDownload
+# from buildbot.steps.transfer import FileDownload
from buildbot.steps.master import MasterShellCommand
from buildbot.config import BuilderConfig
@@ -50,6 +52,7 @@
c['builders'] = []
buildernames = []
+
def add_builder(c, name, libdir, factory):
slavenames = []
@@ -64,15 +67,18 @@
# common steps
+
def svn_step():
return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
+
def lib_svn_step(dir):
return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
# generic builder
-def generic_builder(id, libdir=''):
+
+def generic_builder(id, libdir=""):
filename = 'buildbot_upload_' + id + '.zip'
compile_script = '../blender/build_files/buildbot/slave_compile.py'
test_script = '../blender/build_files/buildbot/slave_test.py'
@@ -88,9 +94,9 @@
f.addStep(Test(command=['python', test_script, id]))
f.addStep(ShellCommand(name='package', command=['python', pack_script, id], description='packaging', descriptionDone='packaged'))
if id.find('cmake') != -1:
- f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100*1024*1024))
+ f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024))
else:
- f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100*1024*1024, workdir='install'))
+ f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install'))
f.addStep(MasterShellCommand(name='unpack', command=['python', unpack_script, filename], description='unpacking', descriptionDone='unpacked'))
return f
@@ -107,7 +113,7 @@
#
# Decide how to react to incoming changes.
-from buildbot.scheduler import Scheduler
+# from buildbot.scheduler import Scheduler
from buildbot.schedulers import timed
c['schedulers'] = []
@@ -132,18 +138,18 @@
c['status'] = []
from buildbot.status import html
-from buildbot.status.web import auth, authz
+from buildbot.status.web import authz
-authz_cfg=authz.Authz(
+authz_cfg = authz.Authz(
# change any of these to True to enable; see the manual for more
# options
- gracefulShutdown = False,
- forceBuild = True, # use this to test your slave once it is set up
- forceAllBuilds = False,
- pingBuilder = False,
- stopBuild = False,
- stopAllBuilds = False,
- cancelPendingBuild = False,
+ gracefulShutdown=False,
+ forceBuild=True, # use this to test your slave once it is set up
+ forceAllBuilds=False,
+ pingBuilder=False,
+ stopBuild=False,
+ stopAllBuilds=False,
+ cancelPendingBuild=False,
)
c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
@@ -168,4 +174,3 @@
# installations.
c['db_url'] = "sqlite:///state.sqlite"
-
Modified: trunk/blender/build_files/buildbot/master_unpack.py
===================================================================
--- trunk/blender/build_files/buildbot/master_unpack.py 2011-03-27 03:29:27 UTC (rev 35809)
+++ trunk/blender/build_files/buildbot/master_unpack.py 2011-03-27 05:23:14 UTC (rev 35810)
@@ -19,6 +19,8 @@
# Runs on Buildbot master, to unpack incoming unload.zip into latest
# builds directory and remove older builds.
+# <pep8 compliant>
+
import os
import shutil
import sys
Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py 2011-03-27 03:29:27 UTC (rev 35809)
+++ trunk/blender/build_files/buildbot/slave_compile.py 2011-03-27 05:23:14 UTC (rev 35810)
@@ -16,6 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
+# <pep8 compliant>
+
import os
import subprocess
import sys
@@ -56,4 +58,3 @@
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
-
Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py 2011-03-27 03:29:27 UTC (rev 35809)
+++ trunk/blender/build_files/buildbot/slave_pack.py 2011-03-27 05:23:14 UTC (rev 35810)
@@ -16,6 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
+# <pep8 compliant>
+
# Runs on buildbot slave, creating a release package using the build
# system and zipping it into buildbot_upload.zip. This is then uploaded
# to the master in the next buildbot step.
@@ -83,4 +85,3 @@
except Exception, ex:
sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n')
sys.exit(1)
-
Modified: trunk/blender/build_files/buildbot/slave_test.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_test.py 2011-03-27 03:29:27 UTC (rev 35809)
+++ trunk/blender/build_files/buildbot/slave_test.py 2011-03-27 05:23:14 UTC (rev 35810)
@@ -16,7 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
-import os
+# <pep8 compliant>
+
import subprocess
import sys
@@ -37,4 +38,3 @@
else:
# scons
pass
-
Modified: trunk/blender/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2011-03-27 03:29:27 UTC (rev 35809)
+++ trunk/blender/build_files/cmake/cmake_qtcreator_project.py 2011-03-27 05:23:14 UTC (rev 35810)
@@ -126,7 +126,6 @@
defines = []
import os
- import sys
create_eclipse_project(CMAKE_DIR)
Modified: trunk/blender/build_files/package_spec/build_archive.py
===================================================================
--- trunk/blender/build_files/package_spec/build_archive.py 2011-03-27 03:29:27 UTC (rev 35809)
+++ trunk/blender/build_files/package_spec/build_archive.py 2011-03-27 05:23:14 UTC (rev 35810)
@@ -1,5 +1,7 @@
#!/usr/bin/python
+# <pep8 compliant>
+
import os
import shutil
import subprocess
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-03-27 03:29:27 UTC (rev 35809)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2011-03-27 05:23:14 UTC (rev 35810)
@@ -110,6 +110,7 @@
else:
_BPY_PROP_COLLECTION_ID = "collection"
+
def undocumented_message(module_name, type_name, identifier):
if str(type_name).startswith('<module'):
preloadtitle = '%s.%s' % (module_name, identifier)
Modified: trunk/blender/release/scripts/modules/animsys_refactor.py
===================================================================
--- trunk/blender/release/scripts/modules/animsys_refactor.py 2011-03-27 03:29:27 UTC (rev 35809)
+++ trunk/blender/release/scripts/modules/animsys_refactor.py 2011-03-27 05:23:14 UTC (rev 35810)
@@ -27,11 +27,13 @@
IS_TESTING = False
+
def drepr(string):
# is there a less crappy way to do this in python?, re.escape also escapes
# single quotes strings so cant use it.
- return '"%s"' % repr(string)[1:-1].replace("\"", "\\\"").replace("\\'","'")
+ return '"%s"' % repr(string)[1:-1].replace("\"", "\\\"").replace("\\'", "'")
+
class DataPathBuilder(object):
__slots__ = ("data_path", )
""" Dummy class used to parse fcurve and driver data paths.
@@ -185,7 +187,7 @@
if data_path_new != data_path:
if not IS_TESTING:
fcurve.data_path = data_path_new
- fcurve.driver.is_valid = True; # reset to allow this to work again
+ fcurve.driver.is_valid = True # reset to allow this to work again
print("driver-fcurve (%s): %s -> %s" % (id_data.name, data_path, data_path_new))
for var in fcurve.driver.variables:
Modified: trunk/blender/release/scripts/modules/bpyml.py
===================================================================
--- trunk/blender/release/scripts/modules/bpyml.py 2011-03-27 03:29:27 UTC (rev 35809)
+++ trunk/blender/release/scripts/modules/bpyml.py 2011-03-27 05:23:14 UTC (rev 35810)
@@ -160,9 +160,9 @@
from bpyml_test import *
draw = [
- ui() [
- split() [
- column() [
+ ui()[
+ split()[
+ column()[
prop(data='context.scene.render', property='use_stamp_time', text='Time'),
prop(data='context.scene.render', property='use_stamp_date', text='Date'),
prop(data='context.scene.render', property='use_stamp_render_time', text='RenderTime'),
@@ -173,7 +173,7 @@
prop(data='context.scene.render', property='use_stamp_marker', text='Marker'),
prop(data='context.scene.render', property='use_stamp_sequencer_strip', text='Seq. Strip')
],
- column() [
+ column()[
active(expr='context.scene.render.use_stamp'),
prop(data='context.scene.render', property='stamp_foreground', slider=True),
prop(data='context.scene.render', property='stamp_background', slider=True),
@@ -181,9 +181,9 @@
prop(data='context.scene.render', property='stamp_font_size', text='Font Size')
]
],
- split(percentage=0.2) [
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list