[Bf-docboard-svn] bf-manual: [9124] trunk/blender_docs: Cleanup: revert some over-wrapping from rBM9079
Campbell Barton
noreply at blender.org
Tue Mar 15 04:32:56 CET 2022
Revision: 9124
https://developer.blender.org/rBM9124
Author: campbellbarton
Date: 2022-03-15 04:32:56 +0100 (Tue, 15 Mar 2022)
Log Message:
-----------
Cleanup: revert some over-wrapping from rBM9079
These lines didn't exceed 120 columns so there is no need to wrap them.
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/po_shortcuts.py
trunk/blender_docs/tools_maintenance/update_po.py
trunk/blender_docs/tools_maintenance/update_screenshots.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_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_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-15 03:19:38 UTC (rev 9123)
+++ trunk/blender_docs/tools/svn_commit.py 2022-03-15 03:32:56 UTC (rev 9124)
@@ -15,10 +15,8 @@
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-15 03:19:38 UTC (rev 9123)
+++ trunk/blender_docs/tools_maintenance/blender_help_extract.py 2022-03-15 03:32:56 UTC (rev 9124)
@@ -35,8 +35,7 @@
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
]
)
@@ -204,11 +203,9 @@
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).\"')
@@ -216,8 +213,7 @@
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
@@ -296,8 +292,7 @@
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)
@@ -317,8 +312,7 @@
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"
Modified: trunk/blender_docs/tools_maintenance/generate_node_screenshots.py
===================================================================
--- trunk/blender_docs/tools_maintenance/generate_node_screenshots.py 2022-03-15 03:19:38 UTC (rev 9123)
+++ trunk/blender_docs/tools_maintenance/generate_node_screenshots.py 2022-03-15 03:32:56 UTC (rev 9124)
@@ -39,10 +39,8 @@
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])
Modified: trunk/blender_docs/tools_maintenance/po_shortcuts.py
===================================================================
--- trunk/blender_docs/tools_maintenance/po_shortcuts.py 2022-03-15 03:19:38 UTC (rev 9123)
+++ trunk/blender_docs/tools_maintenance/po_shortcuts.py 2022-03-15 03:32:56 UTC (rev 9124)
@@ -116,8 +116,7 @@
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))
@@ -146,8 +145,7 @@
with open(filename, 'w', encoding="utf-8") as f:
f.write("".join(text_dst))
- print(filename[filename.find('LC_MESSAGES')+11:] +
- ':', n_total, 'change(s).')
+ print(filename[filename.find('LC_MESSAGES')+11:] + ':', n_total, 'change(s).')
if __name__ == "__main__":
Modified: trunk/blender_docs/tools_maintenance/update_po.py
===================================================================
--- trunk/blender_docs/tools_maintenance/update_po.py 2022-03-15 03:19:38 UTC (rev 9123)
+++ trunk/blender_docs/tools_maintenance/update_po.py 2022-03-15 03:32:56 UTC (rev 9124)
@@ -84,8 +84,7 @@
sys.stdout.flush()
sys.stderr.flush()
- processes.append(
- (args_index, subprocess.Popen(["sphinx-intl", *args])))
+ processes.append((args_index, subprocess.Popen(["sphinx-intl", *args])))
while processes:
processes_clear_finished()
@@ -133,8 +132,7 @@
def main():
# True when all languages are checked out under "locale/".
- has_complete_locale_checkout = os.path.exists(
- os.path.join(LOCALE_DIR, ".svn"))
+ has_complete_locale_checkout = os.path.exists(os.path.join(LOCALE_DIR, ".svn"))
# All directories containing '.svn' (the parent directory).
svn_dirs_all = []
@@ -216,8 +214,7 @@
print("Warning, the following commands returned non-zero exit codes:")
for returncode, arg in zip(sphinx_intl_return_codes, sphinx_intl_arg_list):
if returncode != 0:
- print("returncode:", returncode,
- "from command:", "sphinx-intl", arg)
+ print("returncode:", returncode, "from command:", "sphinx-intl", arg)
print("Some manual corrections might need to be done.")
del sphinx_intl_return_codes, sphinx_intl_arg_list
@@ -261,18 +258,14 @@
# 'shlex.quote' causes path separator to be converted to forward slashes,
# causing the command to fail.
if IS_WIN32:
- print(
- " " + subprocess.list2cmdline(["svn", "ci", svn_dir, "-m", "Update r" + revision]))
+ print(" " + subprocess.list2cmdline(["svn", "ci", svn_dir, "-m", "Update r" + revision]))
else:
- print(
- " svn ci {:s} -m \"Update r{:s}\"".format(quote(svn_dir), revision))
+ print(" svn ci {:s} -m \"Update r{:s}\"".format(quote(svn_dir), revision))
if IS_WIN32:
- print(
- " " + subprocess.list2cmdline(["svn", "ci", POT_FILE, "-m", "Update r" + revision]))
+ print(" " + subprocess.list2cmdline(["svn", "ci", POT_FILE, "-m", "Update r" + revision]))
else:
- print(
- " svn ci {:s} -m \"Update r{:s}\"".format(quote(POT_FILE), revision))
+ print(" svn ci {:s} -m \"Update r{:s}\"".format(quote(POT_FILE), revision))
if __name__ == "__main__":
Modified: trunk/blender_docs/tools_maintenance/update_screenshots.py
===================================================================
--- trunk/blender_docs/tools_maintenance/update_screenshots.py 2022-03-15 03:19:38 UTC (rev 9123)
+++ trunk/blender_docs/tools_maintenance/update_screenshots.py 2022-03-15 03:32:56 UTC (rev 9124)
@@ -302,10 +302,8 @@
for filename in os.listdir(IMAGE_DIR_PREVIEW):
- file_old = os.path.relpath(os.path.join(
- IMAGE_DIR_FINAL, filename), ROOT_DIR)
- file_new = os.path.relpath(os.path.join(
- IMAGE_DIR_PREVIEW, filename), ROOT_DIR)
+ file_old = os.path.relpath(os.path.join(IMAGE_DIR_FINAL, filename), ROOT_DIR)
+ file_new = os.path.relpath(os.path.join(IMAGE_DIR_PREVIEW, filename), ROOT_DIR)
fw(' <tr>\n')
fw(' <td><img src="{:s}" style="width: 100%"></td>\n'.format(file_old))
Modified: trunk/blender_docs/tools_report/report_translation_progress.py
===================================================================
--- trunk/blender_docs/tools_report/report_translation_progress.py 2022-03-15 03:19:38 UTC (rev 9123)
+++ trunk/blender_docs/tools_report/report_translation_progress.py 2022-03-15 03:32:56 UTC (rev 9124)
@@ -56,8 +56,7 @@
for po_filepath in po_files(path):
- (msgstrs_file_complete, msgstrs_file_empty,
- msgstrs_file_fuzzy) = parse_file(po_filepath)
+ (msgstrs_file_complete, msgstrs_file_empty, msgstrs_file_fuzzy) = parse_file(po_filepath)
if msgstrs_file_fuzzy > 0:
msgstrs_all_fuzzy_files.add(po_filepath)
Modified: trunk/blender_docs/tools_rst/rst_batch_edit.py
===================================================================
--- trunk/blender_docs/tools_rst/rst_batch_edit.py 2022-03-15 03:19:38 UTC (rev 9123)
+++ trunk/blender_docs/tools_rst/rst_batch_edit.py 2022-03-15 03:32:56 UTC (rev 9124)
@@ -140,8 +140,7 @@
table_content.append([[] for k in range(tot_row)])
add_col()
- tot_indent = len(lines[is_table]) - \
- len(lines[is_table].lstrip())
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-docboard-svn
mailing list