Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-06-20 02:17:19 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-20 02:17:19 +0400
commit98e69124807b9a5e16b617c89347fc77072e9b38 (patch)
tree682b17e9cbd03eb447962f2d6743ad849272e6e3 /release/scripts/modules
parenta8f23a96a4f804bbf8d1ef67acfc4f8a57c319b1 (diff)
style cleanup
Diffstat (limited to 'release/scripts/modules')
-rw-r--r--release/scripts/modules/addon_utils.py4
-rw-r--r--release/scripts/modules/animsys_refactor.py6
-rwxr-xr-xrelease/scripts/modules/blend_render_info.py6
-rw-r--r--release/scripts/modules/bpy/__init__.py6
-rw-r--r--release/scripts/modules/bpy/ops.py4
-rw-r--r--release/scripts/modules/bpy/utils.py2
-rw-r--r--release/scripts/modules/bpy_extras/image_utils.py2
-rw-r--r--release/scripts/modules/bpy_extras/keyconfig_utils.py2
-rw-r--r--release/scripts/modules/bpy_extras/mesh_utils.py2
-rw-r--r--release/scripts/modules/bpyml_ui.py2
-rw-r--r--release/scripts/modules/console_shell.py2
-rw-r--r--release/scripts/modules/graphviz_export.py2
-rw-r--r--release/scripts/modules/rna_info.py12
-rw-r--r--release/scripts/modules/rna_xml.py2
-rw-r--r--release/scripts/modules/sys_info.py4
15 files changed, 29 insertions, 29 deletions
diff --git a/release/scripts/modules/addon_utils.py b/release/scripts/modules/addon_utils.py
index 695bb8cb6b6..f90c04eda02 100644
--- a/release/scripts/modules/addon_utils.py
+++ b/release/scripts/modules/addon_utils.py
@@ -183,8 +183,8 @@ def modules(module_cache):
del modules_stale
mod_list = list(module_cache.values())
- mod_list.sort(key=lambda mod: (mod.bl_info['category'],
- mod.bl_info['name'],
+ mod_list.sort(key=lambda mod: (mod.bl_info["category"],
+ mod.bl_info["name"],
))
return mod_list
diff --git a/release/scripts/modules/animsys_refactor.py b/release/scripts/modules/animsys_refactor.py
index 097a0296a8e..06c449afd41 100644
--- a/release/scripts/modules/animsys_refactor.py
+++ b/release/scripts/modules/animsys_refactor.py
@@ -887,9 +887,9 @@ if __name__ == "__main__":
# Example, should be called externally
# (class, from, to)
replace_ls = [
- ('AnimVizMotionPaths', 'frame_after', 'frame_after'),
- ('AnimVizMotionPaths', 'frame_before', 'frame_before'),
- ('AnimVizOnionSkinning', 'frame_after', 'frame_after'),
+ ("AnimVizMotionPaths", "frame_after", "frame_after"),
+ ("AnimVizMotionPaths", "frame_before", "frame_before"),
+ ("AnimVizOnionSkinning", "frame_after", "frame_after"),
]
update_data_paths(replace_ls)
diff --git a/release/scripts/modules/blend_render_info.py b/release/scripts/modules/blend_render_info.py
index 5a09f664637..8762ea0e287 100755
--- a/release/scripts/modules/blend_render_info.py
+++ b/release/scripts/modules/blend_render_info.py
@@ -36,14 +36,14 @@ def read_blend_rend_chunk(path):
import struct
- blendfile = open(path, 'rb')
+ blendfile = open(path, "rb")
head = blendfile.read(7)
if head[0:2] == b'\x1f\x8b': # gzip magic
import gzip
blendfile.close()
- blendfile = gzip.open(path, 'rb')
+ blendfile = gzip.open(path, "rb")
head = blendfile.read(7)
if head != b'BLENDER':
@@ -80,7 +80,7 @@ def read_blend_rend_chunk(path):
scene_name = scene_name[:scene_name.index(b'\0')]
try:
- scene_name = str(scene_name, 'utf8')
+ scene_name = str(scene_name, "utf8")
except TypeError:
pass
diff --git a/release/scripts/modules/bpy/__init__.py b/release/scripts/modules/bpy/__init__.py
index 621484fc896..34b7a9ea7b6 100644
--- a/release/scripts/modules/bpy/__init__.py
+++ b/release/scripts/modules/bpy/__init__.py
@@ -63,11 +63,11 @@ def main():
#~ if "-d" in sys.argv: # Enable this to measure start up speed
if 0:
import cProfile
- cProfile.run('import bpy; bpy.utils.load_scripts()', 'blender.prof')
+ cProfile.run("import bpy; bpy.utils.load_scripts()", "blender.prof")
import pstats
- p = pstats.Stats('blender.prof')
- p.sort_stats('cumulative').print_stats(100)
+ p = pstats.Stats("blender.prof")
+ p.sort_stats("cumulative").print_stats(100)
else:
utils.load_scripts()
diff --git a/release/scripts/modules/bpy/ops.py b/release/scripts/modules/bpy/ops.py
index d01b706cc37..056fcdb519e 100644
--- a/release/scripts/modules/bpy/ops.py
+++ b/release/scripts/modules/bpy/ops.py
@@ -74,7 +74,7 @@ class BPyOpsSubMod(object):
eg. bpy.ops.object
'''
- __keys__ = ('module',)
+ __keys__ = ("module",)
def __init__(self, module):
self.module = module
@@ -111,7 +111,7 @@ class BPyOpsSubModOp(object):
eg. bpy.ops.object.somefunc
'''
- __keys__ = ('module', 'func')
+ __keys__ = ("module", "func")
def _get_doc(self):
return op_as_string(self.idname())
diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py
index 4e8179775d5..da12975e4a6 100644
--- a/release/scripts/modules/bpy/utils.py
+++ b/release/scripts/modules/bpy/utils.py
@@ -489,7 +489,7 @@ def keyconfig_set(filepath):
try:
keyfile = open(filepath)
- exec(compile(keyfile.read(), filepath, 'exec'), {"__file__": filepath})
+ exec(compile(keyfile.read(), filepath, "exec"), {"__file__": filepath})
keyfile.close()
except:
import traceback
diff --git a/release/scripts/modules/bpy_extras/image_utils.py b/release/scripts/modules/bpy_extras/image_utils.py
index c21b750fd1f..36994d3fddd 100644
--- a/release/scripts/modules/bpy_extras/image_utils.py
+++ b/release/scripts/modules/bpy_extras/image_utils.py
@@ -71,7 +71,7 @@ def load_image(imagepath,
def _image_load_placeholder(path):
name = bpy.path.basename(path)
if type(name) == bytes:
- name = name.decode('utf-8', "replace")
+ name = name.decode("utf-8", "replace")
image = bpy.data.images.new(name, 128, 128)
# allow the path to be resolved later
image.filepath = path
diff --git a/release/scripts/modules/bpy_extras/keyconfig_utils.py b/release/scripts/modules/bpy_extras/keyconfig_utils.py
index f8b0abd03ea..dbff90c2447 100644
--- a/release/scripts/modules/bpy_extras/keyconfig_utils.py
+++ b/release/scripts/modules/bpy_extras/keyconfig_utils.py
@@ -171,7 +171,7 @@ def keyconfig_export(wm, kc, filepath):
# First add all user_modified keymaps (found in keyconfigs.user.keymaps list),
# then add all remaining keymaps from the currently active custom keyconfig.
#
- # This will create a final list of keymaps that can be used as a 'diff' against
+ # This will create a final list of keymaps that can be used as a "diff" against
# the default blender keyconfig, recreating the current setup from a fresh blender
# without needing to export keymaps which haven't been edited.
diff --git a/release/scripts/modules/bpy_extras/mesh_utils.py b/release/scripts/modules/bpy_extras/mesh_utils.py
index 3ce45154765..fa83b1861d2 100644
--- a/release/scripts/modules/bpy_extras/mesh_utils.py
+++ b/release/scripts/modules/bpy_extras/mesh_utils.py
@@ -414,7 +414,7 @@ def ngon_tessellate(from_data, indices, fix_loops=True):
fill = tessellate_polygon([[v[0] for v in loop] for loop in loop_list])
#draw_loops(loop_list)
- #raise 'done loop'
+ #raise Exception("done loop")
# map to original indices
fill = [[vert_map[i] for i in reversed(f)] for f in fill]
diff --git a/release/scripts/modules/bpyml_ui.py b/release/scripts/modules/bpyml_ui.py
index 4828b3649d3..a7e2e7bc04a 100644
--- a/release/scripts/modules/bpyml_ui.py
+++ b/release/scripts/modules/bpyml_ui.py
@@ -73,7 +73,7 @@ def _call_recursive(context, base, py_node):
value = eval(value, {"context": _bpy.context})
setattr(base, py_node[TAG], value)
else:
- value = py_node[ARGS]['value'] # have to have this
+ value = py_node[ARGS]["value"] # have to have this
setattr(base, py_node[TAG], value)
else:
args = _parse_rna_args(base, py_node)
diff --git a/release/scripts/modules/console_shell.py b/release/scripts/modules/console_shell.py
index 772d46c8bf3..c27524ffe44 100644
--- a/release/scripts/modules/console_shell.py
+++ b/release/scripts/modules/console_shell.py
@@ -20,7 +20,7 @@
import os
import bpy
-language_id = 'shell'
+language_id = "shell"
def add_scrollback(text, text_type):
diff --git a/release/scripts/modules/graphviz_export.py b/release/scripts/modules/graphviz_export.py
index b60952a2f88..88f8b15a728 100644
--- a/release/scripts/modules/graphviz_export.py
+++ b/release/scripts/modules/graphviz_export.py
@@ -172,7 +172,7 @@ def graph_armature(obj, filepath, FAKE_PARENT=True, CONSTRAINTS=True, DRIVERS=Tr
fileobject.close()
'''
- print(".", end='')
+ print(".", end="")
import sys
sys.stdout.flush()
'''
diff --git a/release/scripts/modules/rna_info.py b/release/scripts/modules/rna_info.py
index 4116bfda0c7..7eccda74e14 100644
--- a/release/scripts/modules/rna_info.py
+++ b/release/scripts/modules/rna_info.py
@@ -66,9 +66,9 @@ def rna_id_ignore(rna_id):
def range_str(val):
if val < -10000000:
- return '-inf'
+ return "-inf"
elif val > 10000000:
- return 'inf'
+ return "inf"
elif type(val) == float:
return '%g' % val
else:
@@ -305,8 +305,8 @@ class InfoPropertyRNA:
return type_str
def __str__(self):
- txt = ''
- txt += ' * ' + self.identifier + ': ' + self.description
+ txt = ""
+ txt += " * " + self.identifier + ": " + self.description
return txt
@@ -398,7 +398,7 @@ class InfoOperatorRNA:
return None, None
-def _GetInfoRNA(bl_rna, cls, parent_id=''):
+def _GetInfoRNA(bl_rna, cls, parent_id=""):
if bl_rna is None:
return None
@@ -641,7 +641,7 @@ if __name__ == "__main__":
props = [(prop.identifier, prop) for prop in v.properties]
for prop_id, prop in sorted(props):
- # if prop.type == 'boolean':
+ # if prop.type == "boolean":
# continue
prop_type = prop.type
if prop.array_length > 0:
diff --git a/release/scripts/modules/rna_xml.py b/release/scripts/modules/rna_xml.py
index 710035dc29f..5354fd1c776 100644
--- a/release/scripts/modules/rna_xml.py
+++ b/release/scripts/modules/rna_xml.py
@@ -352,7 +352,7 @@ def xml_file_run(context, filepath, rna_map):
def xml_file_write(context, filepath, rna_map):
- file = open(filepath, 'w', encoding='utf-8')
+ file = open(filepath, "w", encoding="utf-8")
fw = file.write
fw("<bpy>\n")
diff --git a/release/scripts/modules/sys_info.py b/release/scripts/modules/sys_info.py
index 0fa80a8f855..6fc50bcfe0d 100644
--- a/release/scripts/modules/sys_info.py
+++ b/release/scripts/modules/sys_info.py
@@ -27,7 +27,7 @@ import sys
def cutPoint(text, length):
- "Returns position of the last space found before 'length' chars"
+ """Returns position of the last space found before 'length' chars"""
l = length
c = text[l]
while c != ' ':
@@ -98,7 +98,7 @@ def write_sysinfo(op):
output.write(lilies)
ffmpeg = bpy.app.ffmpeg
if ffmpeg.supported:
- for lib in ['avcodec', 'avdevice', 'avformat', 'avutil', 'swscale']:
+ for lib in ("avcodec", "avdevice", "avformat", "avutil", "swscale"):
output.write("%r:%r%r\n" % (lib, " " * (10 - len(lib)),
getattr(ffmpeg, lib + "_version_string")))
else: