[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50916] trunk/blender: pep8 cleanup
Campbell Barton
ideasman42 at gmail.com
Wed Sep 26 23:19:52 CEST 2012
Revision: 50916
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50916
Author: campbellbarton
Date: 2012-09-26 21:19:51 +0000 (Wed, 26 Sep 2012)
Log Message:
-----------
pep8 cleanup
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/release/scripts/modules/addon_utils.py
trunk/blender/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
trunk/blender/release/scripts/modules/bl_i18n_utils/check_po.py
trunk/blender/release/scripts/modules/bl_i18n_utils/utils.py
trunk/blender/release/scripts/modules/bpy/utils.py
trunk/blender/release/scripts/modules/console_python.py
trunk/blender/release/scripts/modules/rna_xml.py
trunk/blender/release/scripts/presets/tracking_settings/blurry_footage.py
trunk/blender/release/scripts/presets/tracking_settings/default.py
trunk/blender/release/scripts/presets/tracking_settings/fast_motion.py
trunk/blender/release/scripts/presets/tracking_settings/planar.py
trunk/blender/release/scripts/startup/bl_operators/node.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
trunk/blender/release/scripts/templates/addon_add_object.py
trunk/blender/source/tests/bl_rna_wiki_reference.py
trunk/blender/source/tests/bl_run_operators.py
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -437,6 +437,7 @@
layout.prop(cdata, "use_subdivision")
layout.prop(cdata, "dicing_rate")
+
class Cycles_PT_mesh_normals(CyclesButtonsPanel, Panel):
bl_label = "Normals"
bl_context = "data"
@@ -953,7 +954,7 @@
layout.prop(cscene, "device")
elif device_type == 'OPENCL' and cscene.feature_set == 'EXPERIMENTAL':
layout.prop(cscene, "device")
-
+
if cscene.feature_set == 'EXPERIMENTAL' and cscene.device == 'CPU' and engine.with_osl():
layout.prop(cscene, "shading_system")
Modified: trunk/blender/release/scripts/modules/addon_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/addon_utils.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/release/scripts/modules/addon_utils.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -275,7 +275,8 @@
try:
mod.register()
except:
- print("Exception in module register(): %r" % getattr(mod, "__file__", module_name))
+ print("Exception in module register(): %r" %
+ getattr(mod, "__file__", module_name))
handle_error()
del sys.modules[module_name]
return None
@@ -317,7 +318,8 @@
try:
mod.unregister()
except:
- print("Exception in module unregister(): %r" % getattr(mod, "__file__", module_name))
+ print("Exception in module unregister(): %r" %
+ getattr(mod, "__file__", module_name))
import traceback
traceback.print_exc()
else:
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/bl_process_msg.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/bl_process_msg.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/bl_process_msg.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -16,7 +16,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-# <pep8-80 compliant>
+# <pep8 compliant>
# Write out messages.txt from Blender.
# XXX: This script is meant to be used from inside Blender!
@@ -43,6 +43,7 @@
NC_ALLOWED = settings.WARN_MSGID_NOT_CAPITALIZED_ALLOWED
+
def check(check_ctxt, messages, key, msgsrc):
if check_ctxt is None:
return
@@ -78,7 +79,8 @@
import bpy
def classBlackList():
- blacklist_rna_class = [# core classes
+ blacklist_rna_class = [
+ # core classes
"Context", "Event", "Function", "UILayout",
"BlendData",
# registerable classes
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/check_po.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/check_po.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/check_po.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -162,9 +162,9 @@
" {} specific context{} present:\n {}\n"
"".format(glob_stats["nbr"], glob_stats["lvl"] / glob_stats["nbr"],
glob_stats["lvl_ttips"] / glob_stats["nbr"],
- glob_stats["lvl_trans_ttips"]/glob_stats["nbr"],
- glob_stats["lvl_ttips_in_trans"]/glob_stats["nbr"],
- glob_stats["lvl_comm"]/glob_stats["nbr"], glob_stats["nbr_signs"],
+ glob_stats["lvl_trans_ttips"] / glob_stats["nbr"],
+ glob_stats["lvl_ttips_in_trans"] / glob_stats["nbr"],
+ glob_stats["lvl_comm"] / glob_stats["nbr"], glob_stats["nbr_signs"],
glob_stats["nbr_trans_signs"], nbr_contexts, _ctx_txt,
"\n ".join(glob_stats["contexts"]-{""})))
Modified: trunk/blender/release/scripts/modules/bl_i18n_utils/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bl_i18n_utils/utils.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/release/scripts/modules/bl_i18n_utils/utils.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -95,7 +95,6 @@
msgctxt_lines = []
comment_lines = []
-
def finalize_message():
nonlocal reading_msgid, reading_msgstr, reading_msgctxt, \
reading_comment, is_fuzzy, is_translated, is_commented, \
@@ -225,7 +224,6 @@
if reading_msgstr:
finalize_message()
-
return (messages,
{"trans_msg": translated_messages,
"fuzzy_msg": fuzzy_messages,
Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/release/scripts/modules/bpy/utils.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -59,6 +59,7 @@
_script_module_dirs = "startup", "modules"
+
def _test_import(module_name, loaded_modules):
use_time = _bpy.app.debug_python
@@ -615,12 +616,15 @@
# hooks for doc lookups
_manual_map = [_blender_default_map]
+
def register_manual_map(manual_hook):
_manual_map.append(manual_hook)
+
def unregister_manual_map(manual_hook):
_manual_map.remove(manual_hook)
+
def manual_map():
# reverse so default is called last
for cb in reversed(_manual_map):
@@ -633,4 +637,3 @@
continue
yield prefix, url_manual_mapping
-
Modified: trunk/blender/release/scripts/modules/console_python.py
===================================================================
--- trunk/blender/release/scripts/modules/console_python.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/release/scripts/modules/console_python.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -304,7 +304,7 @@
for line in sc.scrollback:
text = line.body
type = line.type
-
+
if type == 'INFO': # ignore autocomp.
continue
if type == 'INPUT':
Modified: trunk/blender/release/scripts/modules/rna_xml.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_xml.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/release/scripts/modules/rna_xml.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -259,7 +259,7 @@
except ValueError:
try:
value_xml_coerce = [float(v) for v in value_xml_split]
- except ValueError: # bool vector property
+ except ValueError: # bool vector property
value_xml_coerce = [{'TRUE': True, 'FALSE': False}[v] for v in value_xml_split]
del value_xml_split
tp_name = 'ARRAY'
Modified: trunk/blender/release/scripts/presets/tracking_settings/blurry_footage.py
===================================================================
--- trunk/blender/release/scripts/presets/tracking_settings/blurry_footage.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/release/scripts/presets/tracking_settings/blurry_footage.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -14,4 +14,4 @@
settings.use_default_red_channel = True
settings.use_default_green_channel = True
settings.use_default_blue_channel = True
-settings.default_correlation_min = 0.6
\ No newline at end of file
+settings.default_correlation_min = 0.6
Modified: trunk/blender/release/scripts/presets/tracking_settings/default.py
===================================================================
--- trunk/blender/release/scripts/presets/tracking_settings/default.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/release/scripts/presets/tracking_settings/default.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -14,4 +14,4 @@
settings.use_default_red_channel = True
settings.use_default_green_channel = True
settings.use_default_blue_channel = True
-settings.default_correlation_min = 0.75
\ No newline at end of file
+settings.default_correlation_min = 0.75
Modified: trunk/blender/release/scripts/presets/tracking_settings/fast_motion.py
===================================================================
--- trunk/blender/release/scripts/presets/tracking_settings/fast_motion.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/release/scripts/presets/tracking_settings/fast_motion.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -14,4 +14,4 @@
settings.use_default_red_channel = True
settings.use_default_green_channel = True
settings.use_default_blue_channel = True
-settings.default_correlation_min = 0.6
\ No newline at end of file
+settings.default_correlation_min = 0.6
Modified: trunk/blender/release/scripts/presets/tracking_settings/planar.py
===================================================================
--- trunk/blender/release/scripts/presets/tracking_settings/planar.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/release/scripts/presets/tracking_settings/planar.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -14,4 +14,4 @@
settings.use_default_red_channel = True
settings.use_default_green_channel = True
settings.use_default_blue_channel = True
-settings.default_correlation_min = 0.75
\ No newline at end of file
+settings.default_correlation_min = 0.75
Modified: trunk/blender/release/scripts/startup/bl_operators/node.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/node.py 2012-09-26 20:26:31 UTC (rev 50915)
+++ trunk/blender/release/scripts/startup/bl_operators/node.py 2012-09-26 21:19:51 UTC (rev 50916)
@@ -22,12 +22,16 @@
from bpy.types import Operator
from bpy.props import EnumProperty
-# XXX These node item lists should actually be generated by a callback at operator execution time (see node_type_items below),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list