Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: pep8

Browse Source
This commit is contained in:
Campbell Barton
2018-07-03 22:35:37 +02:00
parent eb7286bfd2
commit 969111f9b5
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/python_api/sphinx_doc_gen_monkeypatch.py
View File

@@ -21,7 +21,7 @@
# <pep8 compliant> # <pep8 compliant>
bpy_types_Operator_bl_property__doc__ = ( bpy_types_Operator_bl_property__doc__ = (
""" """
The name of a property to use as this operators primary property. The name of a property to use as this operators primary property.
Currently this is only used to select the default property when Currently this is only used to select the default property when
expanding an operator into a menu. expanding an operator into a menu.

7
doc/python_api/sphinx_doc_update.py
View File

@@ -29,7 +29,7 @@ You'll need to specify your user login and password, obviously.
Example usage: 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. # III) Get Blender version info.
getver_file = os.path.join(tmp_dir, "blendver.txt") getver_file = os.path.join(tmp_dir, "blendver.txt")
getver_script = ("" getver_script = (
"import sys, bpy\n" "import sys, bpy\n"
"with open(sys.argv[-1], 'w') as f:\n" "with open(sys.argv[-1], 'w') as f:\n"
" is_release = bpy.app.version_cycle in {'rc', 'release'}\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" " 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" " 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" " 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", get_ver_cmd = (args.blender, "--background", "-noaudio", "--factory-startup", "--python-exit-code", "1",
"--python-expr", getver_script, "--", getver_file) "--python-expr", getver_script, "--", getver_file)
subprocess.run(get_ver_cmd) subprocess.run(get_ver_cmd)

11
release/scripts/modules/bpy/utils/__init__.py
View File

@@ -488,11 +488,11 @@ def smpte_from_frame(frame, fps=None, fps_base=None):
return ( return (
"%s%02d:%02d:%02d:%02d" % ( "%s%02d:%02d:%02d:%02d" % (
sign, sign,
int(frame / (3600 * fps)), # HH int(frame / (3600 * fps)), # HH
int((frame / (60 * fps)) % 60), # MM int((frame / (60 * fps)) % 60), # MM
int((frame / fps) % 60), # SS int((frame / fps) % 60), # SS
int(frame % fps), # FF int(frame % fps), # FF
)) ))
@@ -773,6 +773,7 @@ def _blender_default_map():
del _sys.modules["rna_manual_reference"] del _sys.modules["rna_manual_reference"]
return ret return ret
# hooks for doc lookups # hooks for doc lookups
_manual_map = [_blender_default_map] _manual_map = [_blender_default_map]