Commit: 969111f9b5b075470a6de995f048d19e25c1b9ea
Author: Campbell Barton
Date: Tue Jul 3 22:35:37 2018 +0200
Branches: master
https://developer.blender.org/rB969111f9b5b075470a6de995f048d19e25c1b9ea
Cleanup: pep8
===================================================================
M doc/python_api/sphinx_doc_gen_monkeypatch.py
M doc/python_api/sphinx_doc_update.py
M release/scripts/modules/bpy/utils/__init__.py
===================================================================
diff --git a/doc/python_api/sphinx_doc_gen_monkeypatch.py
b/doc/python_api/sphinx_doc_gen_monkeypatch.py
index 9fdbf613d96..58d09f71e9a 100644
--- a/doc/python_api/sphinx_doc_gen_monkeypatch.py
+++ b/doc/python_api/sphinx_doc_gen_monkeypatch.py
@@ -21,7 +21,7 @@
# <pep8 compliant>
bpy_types_Operator_bl_property__doc__ = (
-"""
+ """
The name of a property to use as this operators primary property.
Currently this is only used to select the default property when
expanding an operator into a menu.
diff --git a/doc/python_api/sphinx_doc_update.py
b/doc/python_api/sphinx_doc_update.py
index 561e58dec66..d43806d128a 100755
--- a/doc/python_api/sphinx_doc_update.py
+++ b/doc/python_api/sphinx_doc_update.py
@@ -29,7 +29,7 @@ You'll need to specify your user login and password,
obviously.
Example usage:
- ./sphinx_doc_update.py --mirror ../../../docs/remote_api_backup/ --source
../.. --blender ../../../build_cmake/bin/blender --user foobar --password
barfoo
+ ./sphinx_doc_update.py --mirror ../../../docs/remote_api_backup/ --source
../.. --blender ../../../build_cmake/bin/blender --user foobar --password barfoo
"""
@@ -114,7 +114,7 @@ def main():
# III) Get Blender version info.
getver_file = os.path.join(tmp_dir, "blendver.txt")
- getver_script = (""
+ getver_script = (
"import sys, bpy\n"
"with open(sys.argv[-1], 'w') as f:\n"
" is_release = bpy.app.version_cycle in {'rc', 'release'}\n"
@@ -124,7 +124,8 @@ def main():
" f.write('%d.%d%s\\n' % (bpy.app.version[0],
bpy.app.version[1], bpy.app.version_char)\n"
" if is_release else '%s\\n' % branch)\n"
" f.write('%d_%d%s_release' % (bpy.app.version[0],
bpy.app.version[1], bpy.app.version_char)\n"
- " if is_release else '%d_%d_%d' % bpy.app.version)\n")
+ " if is_release else '%d_%d_%d' % bpy.app.version)\n"
+ )
get_ver_cmd = (args.blender, "--background", "-noaudio",
"--factory-startup", "--python-exit-code", "1",
"--python-expr", getver_script, "--", getver_file)
subprocess.run(get_ver_cmd)
diff --git a/release/scripts/modules/bpy/utils/__init__.py
b/release/scripts/modules/bpy/utils/__init__.py
index c3175f93f4e..5e5a35b9518 100644
--- a/release/scripts/modules/bpy/utils/__init__.py
+++ b/release/scripts/modules/bpy/utils/__init__.py
@@ -488,11 +488,11 @@ def smpte_from_frame(frame, fps=None, fps_base=None):
return (
"%s%02d:%02d:%02d:%02d" % (
- sign,
- int(frame / (3600 * fps)), # HH
- int((frame / (60 * fps)) % 60), # MM
- int((frame / fps) % 60), # SS
- int(frame % fps), # FF
+ sign,
+ int(frame / (3600 * fps)), # HH
+ int((frame / (60 * fps)) % 60), # MM
+ int((frame / fps) % 60), # SS
+ int(frame % fps), # FF
))
@@ -773,6 +773,7 @@ def _blender_default_map():
del _sys.modules["rna_manual_reference"]
return ret
+
# hooks for doc lookups
_manual_map = [_blender_default_map]
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
