[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51174] trunk/blender: style cleanup: pep8
Campbell Barton
ideasman42 at gmail.com
Mon Oct 8 12:03:01 CEST 2012
Revision: 51174
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51174
Author: campbellbarton
Date: 2012-10-08 10:03:01 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
style cleanup: pep8
Modified Paths:
--------------
trunk/blender/build_files/buildbot/master.cfg
trunk/blender/build_files/buildbot/master_unpack.py
trunk/blender/build_files/buildbot/slave_pack.py
trunk/blender/build_files/cmake/cmake_static_check_clang_array.py
trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
trunk/blender/build_files/cmake/cmake_static_check_smatch.py
trunk/blender/build_files/cmake/cmake_static_check_sparse.py
trunk/blender/build_files/cmake/cmake_static_check_splint.py
trunk/blender/build_files/cmake/project_source_info.py
trunk/blender/doc/python_api/sphinx_doc_gen.py
trunk/blender/intern/tools/bpy_introspect_ui.py
trunk/blender/intern/tools/credits_svn_gen.py
trunk/blender/source/blender/python/rna_dump.py
trunk/blender/source/tests/batch_import.py
trunk/blender/source/tests/bl_load_addons.py
trunk/blender/source/tests/bl_load_py_modules.py
trunk/blender/source/tests/bl_mesh_modifiers.py
trunk/blender/source/tools/check_style_c.py
Modified: trunk/blender/build_files/buildbot/master.cfg
===================================================================
--- trunk/blender/build_files/buildbot/master.cfg 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/build_files/buildbot/master.cfg 2012-10-08 10:03:01 UTC (rev 51174)
@@ -28,8 +28,8 @@
from buildbot.changes.svnpoller import SVNPoller
c['change_source'] = SVNPoller(
- 'https://svn.blender.org/svnroot/bf-blender/trunk/',
- pollinterval=1200)
+ 'https://svn.blender.org/svnroot/bf-blender/trunk/',
+ pollinterval=1200)
# BUILDERS
#
@@ -137,7 +137,8 @@
# builderNames=buildernames,
# periodicBuildTimer=24*60*60))
-c['schedulers'].append(timed.Nightly(name='nightly',
+c['schedulers'].append(timed.Nightly(
+ name='nightly',
builderNames=buildernames,
hour=3,
minute=0))
Modified: trunk/blender/build_files/buildbot/master_unpack.py
===================================================================
--- trunk/blender/build_files/buildbot/master_unpack.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/build_files/buildbot/master_unpack.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -112,7 +112,7 @@
if platform == '':
sys.stderr.write('Failed to detect platform ' +
- 'from package: %r\n' % packagename)
+ 'from package: %r\n' % packagename)
sys.exit(1)
# extract
Modified: trunk/blender/build_files/buildbot/slave_pack.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_pack.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/build_files/buildbot/slave_pack.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -50,9 +50,9 @@
install_dir = os.path.join('..', 'install', builder)
scons_options += ['WITH_BF_NOBLENDER=True', 'WITH_BF_PLAYER=False',
- 'BF_BUILDDIR=' + build_dir,
- 'BF_INSTALLDIR=' + install_dir,
- 'WITHOUT_BF_INSTALL=True']
+ 'BF_BUILDDIR=' + build_dir,
+ 'BF_INSTALLDIR=' + install_dir,
+ 'WITHOUT_BF_INSTALL=True']
config = None
bits = None
Modified: trunk/blender/build_files/cmake/cmake_static_check_clang_array.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_clang_array.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/build_files/cmake/cmake_static_check_clang_array.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -52,7 +52,7 @@
[c] +
[("-I%s" % i) for i in inc_dirs] +
[("-D%s" % d) for d in defs]
- )
+ )
check_commands.append((c, cmd))
Modified: trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -55,7 +55,7 @@
[c] +
[("-I%s" % i) for i in inc_dirs] +
[("-D%s" % d) for d in defs]
- )
+ )
check_commands.append((c, cmd))
Modified: trunk/blender/build_files/cmake/cmake_static_check_smatch.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_smatch.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/build_files/cmake/cmake_static_check_smatch.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -50,7 +50,7 @@
[c] +
[("-I%s" % i) for i in inc_dirs] +
[("-D%s" % d) for d in defs]
- )
+ )
check_commands.append((c, cmd))
Modified: trunk/blender/build_files/cmake/cmake_static_check_sparse.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_sparse.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/build_files/cmake/cmake_static_check_sparse.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -48,7 +48,7 @@
[c] +
[("-I%s" % i) for i in inc_dirs] +
[("-D%s" % d) for d in defs]
- )
+ )
check_commands.append((c, cmd))
Modified: trunk/blender/build_files/cmake/cmake_static_check_splint.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_static_check_splint.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/build_files/cmake/cmake_static_check_splint.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -80,7 +80,7 @@
[c] +
[("-I%s" % i) for i in inc_dirs] +
[("-D%s" % d) for d in defs]
- )
+ )
check_commands.append((c, cmd))
Modified: trunk/blender/build_files/cmake/project_source_info.py
===================================================================
--- trunk/blender/build_files/cmake/project_source_info.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/build_files/cmake/project_source_info.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -85,7 +85,7 @@
print("running make with --dry-run ...")
process = subprocess.Popen(["make", "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
stdout=subprocess.PIPE,
- )
+ )
while process.poll():
time.sleep(1)
Modified: trunk/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- trunk/blender/doc/python_api/sphinx_doc_gen.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/doc/python_api/sphinx_doc_gen.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -399,7 +399,7 @@
available_themes = SPHINX_THEMES['bf'] + SPHINX_THEMES['sphinx']
if ARGS.sphinx_theme not in available_themes:
- print ("Please choose a theme among: %s" % ', '.join(available_themes))
+ print("Please choose a theme among: %s" % ', '.join(available_themes))
sys.exit()
if ARGS.sphinx_theme in SPHINX_THEMES['bf']:
Modified: trunk/blender/intern/tools/bpy_introspect_ui.py
===================================================================
--- trunk/blender/intern/tools/bpy_introspect_ui.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/intern/tools/bpy_introspect_ui.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -291,7 +291,7 @@
bpy.data.particles = ()
bpy.data.file_is_saved = True
-
+
bpy.utils = module_add("bpy.utils")
bpy.utils.smpte_from_frame = lambda f: ""
bpy.utils.script_paths = lambda f: []
@@ -360,7 +360,6 @@
for cls in classes:
setattr(bpy.types, cls.__name__, cls)
-
fake_runtime()
# print("running...")
Modified: trunk/blender/intern/tools/credits_svn_gen.py
===================================================================
--- trunk/blender/intern/tools/credits_svn_gen.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/intern/tools/credits_svn_gen.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -522,7 +522,6 @@
commit.author)
credit = credits.get(author)
if credit is None:
-
if commit.author not in alert_users:
print("warning: '%s' is not in "
"'author_name_mapping' !" % commit.author)
@@ -557,8 +556,7 @@
filename = "credits.html"
else:
filename = "credits_release.html"
-
-
+
file = open(filename, 'w', encoding="utf-8")
file.write("<h3>Individual Contributors</h3>\n\n")
@@ -612,7 +610,6 @@
file.write("\n\n")
-
# -------------------------------------------------------------------------
# Companies, hard coded
if is_main_credits:
Modified: trunk/blender/source/blender/python/rna_dump.py
===================================================================
--- trunk/blender/source/blender/python/rna_dump.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/source/blender/python/rna_dump.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -95,7 +95,7 @@
if GEN_PATH:
newtxt = txt + '.' + item
- if item == 'rna_type' and VERBOSE_TYPE == False: # just avoid because it spits out loads of data
+ if item == 'rna_type' and VERBOSE_TYPE is False: # just avoid because it spits out loads of data
continue
value = getattr(r, item, None)
@@ -114,7 +114,7 @@
except:
length = 0
- if VERBOSE == False and length >= 4:
+ if VERBOSE is False and length >= 4:
for i in (0, length - 1):
if i > 0:
if PRINT_DATA:
Modified: trunk/blender/source/tests/batch_import.py
===================================================================
--- trunk/blender/source/tests/batch_import.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/source/tests/batch_import.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -63,12 +63,12 @@
def batch_import(operator="",
- path="",
- save_path="",
- match="",
- start=0,
- end=sys.maxsize,
- ):
+ path="",
+ save_path="",
+ match="",
+ start=0,
+ end=sys.maxsize,
+ ):
import addon_utils
_reset_all = addon_utils.reset_all # XXX, hack
Modified: trunk/blender/source/tests/bl_load_addons.py
===================================================================
--- trunk/blender/source/tests/bl_load_addons.py 2012-10-08 09:39:35 UTC (rev 51173)
+++ trunk/blender/source/tests/bl_load_addons.py 2012-10-08 10:03:01 UTC (rev 51174)
@@ -36,7 +36,7 @@
for mod_name in list(addons.keys()):
addon_utils.disable(mod_name)
- assert(bool(addons) == False)
+ assert(bool(addons) is False)
# Run twice each time.
for i in (0, 1):
Modified: trunk/blender/source/tests/bl_load_py_modules.py
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list