[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40752] trunk/blender: - fix for keymap test operator
Campbell Barton
ideasman42 at gmail.com
Sun Oct 2 20:09:36 CEST 2011
Revision: 40752
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40752
Author: campbellbarton
Date: 2011-10-02 18:09:36 +0000 (Sun, 02 Oct 2011)
Log Message:
-----------
- fix for keymap test operator
- cleanup pep8 warnings and unused py imports
py pep8 cleanup
Modified Paths:
--------------
trunk/blender/po/clean_po.py
trunk/blender/po/merge_po.py
trunk/blender/release/scripts/modules/bpy_extras/keyconfig_utils.py
trunk/blender/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
trunk/blender/source/tools/MakeGLStipple.py
Modified: trunk/blender/po/clean_po.py
===================================================================
--- trunk/blender/po/clean_po.py 2011-10-02 18:08:16 UTC (rev 40751)
+++ trunk/blender/po/clean_po.py 2011-10-02 18:09:36 UTC (rev 40752)
@@ -133,12 +133,12 @@
if pot_messages.get(msgid):
t = po_messages.get(msgid)
if not t:
- print(('Reusing full item from commented ' + \
- 'lines for msgid \'%s\'') % (msgid))
+ print("Reusing full item from commented "
+ "lines for msgid '%s'" % msgid)
po_messages[msgid] = commented_messages[msgid]
elif not t['translation']:
- print(('Reusing translation from commented ' + \
- 'lines for msgid \'%s\'') % (msgid))
+ print("Reusing translation from commented "
+ "lines for msgid '%s'" % msgid)
m = commented_messages[msgid]
t['translation'] = m['translation']
t['translation_lines'] = m['translation_lines']
@@ -153,17 +153,17 @@
first = True
for x in item['message_lines']:
if first:
- handle.write("msgid \"%s\"\n" % (x))
+ handle.write("msgid \"%s\"\n" % x)
else:
- handle.write("\"%s\"\n" % (x))
+ handle.write("\"%s\"\n" % x)
first = False
first = True
for x in item['translation_lines']:
if first:
- handle.write("msgstr \"%s\"\n" % (x))
+ handle.write("msgstr \"%s\"\n" % x)
else:
- handle.write("\"%s\"\n" % (x))
+ handle.write("\"%s\"\n" % x)
first = False
handle.write("\n")
Modified: trunk/blender/po/merge_po.py
===================================================================
--- trunk/blender/po/merge_po.py 2011-10-02 18:08:16 UTC (rev 40751)
+++ trunk/blender/po/merge_po.py 2011-10-02 18:09:36 UTC (rev 40752)
@@ -23,7 +23,6 @@
# update the pot file according the POTFILES.in
-import os
import sys
import collections
@@ -145,17 +144,17 @@
first = True
for x in item['message_lines']:
if first:
- handle.write("msgid \"%s\"\n" % (x))
+ handle.write("msgid \"%s\"\n" % x)
else:
- handle.write("\"%s\"\n" % (x))
+ handle.write("\"%s\"\n" % x)
first = False
first = True
for x in item['translation_lines']:
if first:
- handle.write("msgstr \"%s\"\n" % (x))
+ handle.write("msgstr \"%s\"\n" % x)
else:
- handle.write("\"%s\"\n" % (x))
+ handle.write("\"%s\"\n" % x)
first = False
handle.write("\n")
Modified: trunk/blender/release/scripts/modules/bpy_extras/keyconfig_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/keyconfig_utils.py 2011-10-02 18:08:16 UTC (rev 40751)
+++ trunk/blender/release/scripts/modules/bpy_extras/keyconfig_utils.py 2011-10-02 18:09:36 UTC (rev 40752)
@@ -119,14 +119,17 @@
"""
merged_keymaps = [(km, kc1) for km in kc1.keymaps]
if kc1 != kc2:
- merged_keymaps.extend((km, kc2) for km in kc2.keymaps if not _km_exists_in(km, merged_keymaps))
+ merged_keymaps.extend((km, kc2) for km in kc2.keymaps if not km_exists_in(km, merged_keymaps))
return merged_keymaps
-def keyconfig_export(wm, kc, filepath):
+def _export_properties(prefix, properties, lines=None):
from bpy.types import OperatorProperties
+ if lines is None:
+ lines = []
+
def string_value(value):
if isinstance(value, str) or isinstance(value, bool) or isinstance(value, float) or isinstance(value, int):
result = repr(value)
@@ -137,21 +140,20 @@
return result
- def export_properties(prefix, properties, lines=None):
- if lines is None:
- lines = []
+ for pname in properties.bl_rna.properties.keys():
+ if pname != "rna_type" and not properties.is_property_hidden(pname):
+ value = getattr(properties, pname)
+ if isinstance(value, OperatorProperties):
+ _export_properties(prefix + "." + pname, value, lines)
+ elif properties.is_property_set(pname):
+ value = string_value(value)
+ if value != "":
+ lines.append("%s.%s = %s\n" % (prefix, pname, value))
+ return lines
- for pname in properties.bl_rna.properties.keys():
- if pname != "rna_type" and not properties.is_property_hidden(pname):
- value = getattr(properties, pname)
- if isinstance(value, OperatorProperties):
- export_properties(prefix + "." + pname, value, lines)
- elif properties.is_property_set(pname):
- value = string_value(value)
- if value != "":
- lines.append("%s.%s = %s\n" % (prefix, pname, value))
- return lines
+def keyconfig_export(wm, kc, filepath):
+
f = open(filepath, "w")
f.write("import bpy\n")
@@ -209,7 +211,7 @@
props = kmi.properties
if props is not None:
- f.write("".join(export_properties("kmi.properties", props)))
+ f.write("".join(_export_properties("kmi.properties", props)))
f.write("\n")
@@ -246,7 +248,7 @@
props = kmi.properties
if props is not None:
- export_properties("kmi.properties", props, s)
+ _export_properties("kmi.properties", props, s)
return "".join(s).strip()
Modified: trunk/blender/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_operators/screen_play_rendered_anim.py 2011-10-02 18:08:16 UTC (rev 40751)
+++ trunk/blender/release/scripts/startup/bl_operators/screen_play_rendered_anim.py 2011-10-02 18:09:36 UTC (rev 40752)
@@ -136,7 +136,8 @@
del process
# -----------------------------------------------------------------
- opts = ["-a", "-f", str(rd.fps), str(rd.fps_base), "-j", str(scene.frame_step), file]
+ opts = ["-a", "-f", str(rd.fps), str(rd.fps_base),
+ "-j", str(scene.frame_step), file]
cmd.extend(opts)
elif preset == 'DJV':
opts = [file, "-playback_speed", "%d" % int(rd.fps / rd.fps_base)]
@@ -166,9 +167,8 @@
print("Executing command:\n %r" % " ".join(cmd))
try:
- process = subprocess.Popen(cmd)
+ subprocess.Popen(cmd)
except Exception as e:
- import traceback
self.report({'ERROR'},
"Couldn't run external animation player with command "
"%r\n%s" % (" ".join(cmd), str(e)))
Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref.py 2011-10-02 18:08:16 UTC (rev 40751)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref.py 2011-10-02 18:09:36 UTC (rev 40752)
@@ -22,9 +22,7 @@
import os
import addon_utils
-from bpy.props import StringProperty, BoolProperty, EnumProperty
-
def ui_items_general(col, context):
""" General UI Theme Settings (User Interface)
"""
Modified: trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py 2011-10-02 18:08:16 UTC (rev 40751)
+++ trunk/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py 2011-10-02 18:09:36 UTC (rev 40752)
@@ -19,7 +19,6 @@
# <pep8 compliant>
import bpy
from bpy.types import Menu, OperatorProperties
-import os
class USERPREF_MT_keyconfigs(Menu):
Modified: trunk/blender/source/tools/MakeGLStipple.py
===================================================================
--- trunk/blender/source/tools/MakeGLStipple.py 2011-10-02 18:08:16 UTC (rev 40751)
+++ trunk/blender/source/tools/MakeGLStipple.py 2011-10-02 18:09:36 UTC (rev 40752)
@@ -52,7 +52,7 @@
(xpm, data[0]))
continue
- col_1 = data[1][1]
+ # col_1 = data[1][1]
col_2 = data[2][1]
data = [d[1:-1] for d in data[3:]]
More information about the Bf-blender-cvs
mailing list