[Bf-docboard-svn] bf-manual: [9079] trunk/blender_docs: Cleanup: Python formating
Aaron Carlisle
noreply at blender.org
Thu Mar 3 21:19:19 CET 2022
Revision: 9079
https://developer.blender.org/rBM9079
Author: Blendify
Date: 2022-03-03 21:19:19 +0100 (Thu, 03 Mar 2022)
Log Message:
-----------
Cleanup: Python formating
Modified Paths:
--------------
trunk/blender_docs/tools/svn_commit.py
trunk/blender_docs/tools_maintenance/blender_help_extract.py
trunk/blender_docs/tools_maintenance/generate_node_screenshots.py
trunk/blender_docs/tools_maintenance/image_optimize.py
trunk/blender_docs/tools_maintenance/po_shortcuts.py
trunk/blender_docs/tools_maintenance/update_po.py
trunk/blender_docs/tools_maintenance/update_screenshots.py
trunk/blender_docs/tools_report/file_translation_progress.py
trunk/blender_docs/tools_report/report_translation_progress.py
trunk/blender_docs/tools_rst/rst_batch_edit.py
trunk/blender_docs/tools_rst/rst_check_image_names.py
trunk/blender_docs/tools_rst/rst_check_images.py
trunk/blender_docs/tools_rst/rst_check_spelling.py
trunk/blender_docs/tools_rst/rst_check_syntax.py
trunk/blender_docs/tools_rst/rst_fix_internal_links.py
trunk/blender_docs/tools_rst/rst_helpers/__init__.py
trunk/blender_docs/tools_rst/rst_lint.py
trunk/blender_docs/tools_rst/rst_remap.py
trunk/blender_docs/tools_rst_editor/rst_find_reference.py
Modified: trunk/blender_docs/tools/svn_commit.py
===================================================================
--- trunk/blender_docs/tools/svn_commit.py 2022-03-03 20:14:54 UTC (rev 9078)
+++ trunk/blender_docs/tools/svn_commit.py 2022-03-03 20:19:19 UTC (rev 9079)
@@ -15,8 +15,10 @@
import subprocess
import importlib.util
-mod_file_path = os.path.join(os.path.dirname(__file__), "..", "tools_report", "file_translation_progress.py")
-spec = importlib.util.spec_from_file_location("file_translation_progress", mod_file_path)
+mod_file_path = os.path.join(os.path.dirname(
+ __file__), "..", "tools_report", "file_translation_progress.py")
+spec = importlib.util.spec_from_file_location(
+ "file_translation_progress", mod_file_path)
file_translation_progress = importlib.util.module_from_spec(spec)
spec.loader.exec_module(file_translation_progress)
Modified: trunk/blender_docs/tools_maintenance/blender_help_extract.py
===================================================================
--- trunk/blender_docs/tools_maintenance/blender_help_extract.py 2022-03-03 20:14:54 UTC (rev 9078)
+++ trunk/blender_docs/tools_maintenance/blender_help_extract.py 2022-03-03 20:19:19 UTC (rev 9079)
@@ -22,7 +22,7 @@
pattern = re.compile(
r'//.*?$|/\*.*?\*/|\'(?:\\.|[^\\\'])*\'|"(?:\\.|[^\\"])*"',
re.DOTALL | re.MULTILINE
- )
+ )
return re.sub(pattern, replacer, text)
@@ -35,7 +35,8 @@
lines_out.append([])
text = "\n".join(
[
- " ".join(l.lstrip() if i != 0 else l for i, l in enumerate(l_group))
+ " ".join(l.lstrip() if i != 0 else l for i,
+ l in enumerate(l_group))
for l_group in lines_out
]
)
@@ -50,7 +51,7 @@
pattern_CB = re.compile(
r'\b(CB)\s*\(([^\,]+)\)',
re.DOTALL | re.MULTILINE
- )
+ )
# CB_EX() macro
def replacer_CB_EX(match):
@@ -59,7 +60,7 @@
pattern_CB_EX = re.compile(
r'\b(CB_EX)\s*\(([^\,]+),\s*([^\)]+)\)',
re.DOTALL | re.MULTILINE
- )
+ )
# STRINGIFY_ARG() macro
def replacer_STRINGIFY_ARG(match):
@@ -68,7 +69,7 @@
pattern_STRINGIFY_ARG = re.compile(
r'\b(STRINGIFY_ARG)\s*\(([^\)]+)\)',
re.DOTALL | re.MULTILINE
- )
+ )
text = re.sub(pattern_CB, replacer_CB, text)
text = re.sub(pattern_CB_EX, replacer_CB_EX, text)
@@ -117,7 +118,7 @@
pattern = re.compile(
r'\b(BLI_args_add[_case]*)\s*\(((?:(?!\)\s*;).)*?)\)\s*;',
re.DOTALL | re.MULTILINE
- )
+ )
re.sub(pattern, replacer, text)
return args
@@ -149,7 +150,7 @@
pattern = re.compile(
r'\bstatic\s+const\s+char\s+([A-Za-z0-9_]+)\[\]\s*=\s*((?:(?!"\s*;).)*?")\s*;',
re.DOTALL | re.MULTILINE
- )
+ )
re.sub(pattern, replacer, text)
return strings
@@ -198,15 +199,16 @@
"BKE_blender_version_string": lambda: "|BLENDER_VERSION|",
}
-
def write_arg(arg):
(arg_short, arg_long), arg_text = args_get(arg)
args_used.add((arg_short, arg_long))
# replacement table
- arg_text = re.sub(r"\"\s*STRINGIFY_ARG\s*\(([a-zA-Z0-9_]+)\)\"", r"``\1``", arg_text)
+ arg_text = re.sub(
+ r"\"\s*STRINGIFY_ARG\s*\(([a-zA-Z0-9_]+)\)\"", r"``\1``", arg_text)
arg_text = arg_text.replace('" STRINGIFY(BLENDER_MAX_THREADS) "', "64")
- arg_text = arg_text.replace('" STRINGIFY(BLENDER_STARTUP_FILE) "', "startup.blend")
+ arg_text = arg_text.replace(
+ '" STRINGIFY(BLENDER_STARTUP_FILE) "', "startup.blend")
arg_text = arg_text.replace('" PY_ENABLE_AUTO', '\"')
arg_text = arg_text.replace('" PY_DISABLE_AUTO', ', (default).\"')
@@ -214,10 +216,10 @@
arg_text = eval(arg_text, static_strings)
arg_text = arg_text.replace("\t", " ")
- text_rst.append("``" + "``, ``".join([w for w in (arg_short, arg_long) if w is not None]) + "`` ")
+ text_rst.append(
+ "``" + "``, ``".join([w for w in (arg_short, arg_long) if w is not None]) + "`` ")
text_rst.append(arg_text + "\n")
-
ind_re = None
for l in body:
if l.startswith("printf"):
@@ -294,7 +296,8 @@
del l_tail
elif l_strip.startswith("#"):
indent = l[:len(l) - len(l_strip)]
- l = "\n" + indent + ".. code-block:: sh\n\n" + indent + " " + l.lstrip("# ") + "\n"
+ l = "\n" + indent + ".. code-block:: sh\n\n" + \
+ indent + " " + l.lstrip("# ") + "\n"
else:
# use "'" as "``", except when used as plural, e.g. "Python's"
l = re.sub("(?<![a-z])'|'(?![st])", "``", l)
@@ -314,7 +317,8 @@
text_rst[i] = l
text_rst = [
- ".. DO NOT EDIT THIS FILE, GENERATED BY %r\n" % os.path.basename(__file__),
+ ".. DO NOT EDIT THIS FILE, GENERATED BY %r\n" % os.path.basename(
+ __file__),
"\n"
" CHANGES TO THIS FILE MUST BE MADE IN BLENDER'S SOURCE CODE, SEE:\n"
" https://developer.blender.org/diffusion/B/browse/master/source/creator/creator_args.c\n"
@@ -365,5 +369,6 @@
with open(output_file, 'w') as f:
f.write(text_rst)
+
if __name__ == "__main__":
main()
Modified: trunk/blender_docs/tools_maintenance/generate_node_screenshots.py
===================================================================
--- trunk/blender_docs/tools_maintenance/generate_node_screenshots.py 2022-03-03 20:14:54 UTC (rev 9078)
+++ trunk/blender_docs/tools_maintenance/generate_node_screenshots.py 2022-03-03 20:19:19 UTC (rev 9079)
@@ -1,7 +1,8 @@
-import bpy
+import bpy
from dataclasses import dataclass
from itertools import islice
+
@dataclass
class Rectangle:
x: float
@@ -8,57 +9,60 @@
y: float
width: float
height: float
-
-
+
+
def cut_image(old_path, new_path, rect):
image = bpy.data.images.load(old_path)
-
+
total_width, total_height = image.size
- assert total_width >= rect.x + rect.width
+ assert total_width >= rect.x + rect.width
assert total_height >= rect.y + rect.height
-
+
old_pixels = image.pixels
new_pixels = []
-
+
for y in range(rect.y, rect.y + rect.height):
row_start = y * total_width + rect.x
row_end = row_start + rect.width
new_pixels.extend(old_pixels[4 * row_start:4 * row_end])
-
+
image.scale(rect.width, rect.height)
image.pixels = new_pixels
image.filepath_raw = new_path
image.save()
-
+
bpy.data.images.remove(image)
-
+
+
def node_region_rect(region, node):
location = node.location
dimensions = node.dimensions
-
+
view_to_region = region.view2d.view_to_region
- bottom_left = view_to_region(location.x, location.y - dimensions.y, clip=False)
- top_right = view_to_region(location.x + dimensions.x, location.y, clip=False)
-
+ bottom_left = view_to_region(
+ location.x, location.y - dimensions.y, clip=False)
+ top_right = view_to_region(
+ location.x + dimensions.x, location.y, clip=False)
+
return Rectangle(bottom_left[0], bottom_left[1], top_right[0] - bottom_left[0], top_right[1] - bottom_left[1])
-
+
+
def iter_node_names():
for cls in bpy.types.CompositorNode.__subclasses__():
yield cls.__name__
-
+
+
class MakeScreenshotsOperator(bpy.types.Operator):
bl_idname = "test.make_screenshots"
bl_label = "Make Screenshots"
-
-
+
def invoke(self, context, event):
context.window_manager.modal_handler_add(self)
-
+
self.node_names_iterator = islice(iter_node_names(), 10000)
-
+
return self.prepare_next_node(context)
-
-
+
def prepare_next_node(self, context):
try:
node_name = next(self.node_names_iterator)
@@ -73,12 +77,12 @@
self.current_node = node
self.current_name = node_name
return {'RUNNING_MODAL'}
-
+
def modal(self, context, event):
- temp_path = f"/home/jacques/Downloads/temp.png"
+ temp_path = f"/home/jacques/Downloads/temp.png"
filepath = f"/home/jacques/Downloads/compositing_node-types_{self.current_name}.png"
bpy.ops.screen.screenshot(full=False, filepath=temp_path)
-
+
rect = node_region_rect(context.region, self.current_node)
margin = 15
rect.x -= margin
@@ -85,12 +89,13 @@
rect.y -= margin
rect.width += margin * 2
rect.height += margin * 2
-
- bpy.ops.screen.screenshot(full=False,filepath=filepath)
-
+
+ bpy.ops.screen.screenshot(full=False, filepath=filepath)
+
cut_image(temp_path, filepath, rect)
context.area.tag_redraw()
-
+
return self.prepare_next_node(context)
-
+
+
bpy.utils.register_class(MakeScreenshotsOperator)
Modified: trunk/blender_docs/tools_maintenance/image_optimize.py
===================================================================
--- trunk/blender_docs/tools_maintenance/image_optimize.py 2022-03-03 20:14:54 UTC (rev 9078)
+++ trunk/blender_docs/tools_maintenance/image_optimize.py 2022-03-03 20:19:19 UTC (rev 9079)
@@ -14,6 +14,7 @@
# Ignore result unless it's at least 7.5% improvement
FACTOR = 0.075
+
def find_vcs_root(test, dirs=(".svn", ".git"), default=None):
import os
prev, test = None, os.path.abspath(test)
Modified: trunk/blender_docs/tools_maintenance/po_shortcuts.py
===================================================================
--- trunk/blender_docs/tools_maintenance/po_shortcuts.py 2022-03-03 20:14:54 UTC (rev 9078)
+++ trunk/blender_docs/tools_maintenance/po_shortcuts.py 2022-03-03 20:19:19 UTC (rev 9079)
@@ -116,10 +116,11 @@
table_compiled = []
for key, value in table:
- pattern_str = r'(\:' + ROLE + r'\:["\s]*?`[^`]*?)\b' + key + r'\b([^`]*?`)'
+ pattern_str = r'(\:' + ROLE + \
+ r'\:["\s]*?`[^`]*?)\b' + key + r'\b([^`]*?`)'
replace = r'\1' + value + r'\2'
table_compiled.append((re.compile(pattern_str, re.MULTILINE),
- replace))
+ replace))
for filename in po_files(lang_dir):
with open(filename, 'r', encoding="utf-8") as f:
@@ -145,7 +146,8 @@
with open(filename, 'w', encoding="utf-8") as f:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list