diff --git a/check_blender_release/check_release.py b/check_blender_release/check_release.py
index 6275f79b0833160135ccc2f7e1b8fad63c2669fb..5c8c9c624d9ac732e18f68b5b1572f58432f1bf3 100755
--- a/check_blender_release/check_release.py
+++ b/check_blender_release/check_release.py
@@ -38,13 +38,13 @@ from check_utils import sliceCommandLineArguments
def load_tests(loader, standard_tests, pattern):
standard_tests.addTests(loader.loadTestsFromTestCase(
- check_module_enabled.UnitTesting))
+ check_module_enabled.UnitTesting))
standard_tests.addTests(loader.loadTestsFromTestCase(
- check_module_numpy.UnitTesting))
+ check_module_numpy.UnitTesting))
standard_tests.addTests(loader.loadTestsFromTestCase(
- check_module_requests.UnitTesting))
+ check_module_requests.UnitTesting))
standard_tests.addTests(loader.loadTestsFromTestCase(
- check_static_binaries.UnitTesting))
+ check_static_binaries.UnitTesting))
return standard_tests
diff --git a/check_source/check_descriptions.py b/check_source/check_descriptions.py
index ffd8c30fe25a518293a2be16ba49b3fc5c4b560b..71557623a8ca31b815e8c03b94f342545b1804f8 100644
--- a/check_source/check_descriptions.py
+++ b/check_source/check_descriptions.py
@@ -150,5 +150,6 @@ def check_duplicates():
def main():
check_duplicates()
+
if __name__ == "__main__":
main()
diff --git a/check_source/check_header_duplicate.py b/check_source/check_header_duplicate.py
index 1394f69fe92405b654a938763ea920c6d4f2696c..f0ea90ee413193f9377691b471e417d6f3531f50 100755
--- a/check_source/check_header_duplicate.py
+++ b/check_source/check_header_duplicate.py
@@ -104,5 +104,6 @@ def main():
is_restore = ("--restore" in sys.argv[1:])
scan_source_recursive(sys.argv[-1], is_restore)
+
if __name__ == "__main__":
main()
diff --git a/check_source/check_spelling.py b/check_source/check_spelling.py
index c43a68fe68abb6d4193eb12c47f95536767f6fa9..7558f5fded5ee20c588d44158a35248ac8f0b2b7 100755
--- a/check_source/check_spelling.py
+++ b/check_source/check_spelling.py
@@ -94,7 +94,7 @@ def words_from_text(text):
return False
# check for code in comments
- for c in "<>{}[]():._0123456789\&*":
+ for c in r"<>{}[]():._0123456789\&*":
if c in w:
return False
diff --git a/check_source/check_style_c.py b/check_source/check_style_c.py
index ad05a38f47e6611fc9a1eb8dfd9b90f2774d0ac6..b028330816235702029ccc5fc8163f0a8700c37d 100755
--- a/check_source/check_style_c.py
+++ b/check_source/check_style_c.py
@@ -87,6 +87,7 @@ class TokStore:
self.line = line
self.flag = 0
+
# flags
IS_CAST = (1 << 0)
@@ -1057,6 +1058,8 @@ def quick_check_includes(lines):
inc.add(l_header)
if len(inc) == len_inc:
warning_lineonly("E171", "duplicate includes %r" % l_header, i + 1)
+
+
quick_check_includes.re_inc_match = re.compile(r"\s*#\s*include\s+\"([a-zA-Z0-9_\-\.\/]+)\"").match
@@ -1139,8 +1142,8 @@ def quick_check_indentation(lines):
import re
-re_ifndef = re.compile("^\s*#\s*ifndef\s+([A-z0-9_]+).*$")
-re_define = re.compile("^\s*#\s*define\s+([A-z0-9_]+).*$")
+re_ifndef = re.compile(r"^\s*#\s*ifndef\s+([A-z0-9_]+).*$")
+re_define = re.compile(r"^\s*#\s*define\s+([A-z0-9_]+).*$")
def quick_check_include_guard(lines):
@@ -1270,10 +1273,10 @@ def scan_source(fp, code, args):
# check previous character is either a '{' or whitespace.
if ((tokens[i - 1].line == tok.line) and
- not (tokens[i - 1].text.isspace() or
- tokens[i - 1].text == "{" or
- tokens[i - 1].flag & IS_CAST)
- ):
+ not (tokens[i - 1].text.isspace() or
+ tokens[i - 1].text == "{" or
+ tokens[i - 1].flag & IS_CAST)
+ ):
warning("E150", "no space before '{'", i, i)
blender_check_function_definition(i)
diff --git a/git/git_sort_commits.py b/git/git_sort_commits.py
index 9a77f048d27965b7339aa35b3358a3ada7563d5d..0c704eb8f7689f6ee8973221a03fcb99b331a2e0 100755
--- a/git/git_sort_commits.py
+++ b/git/git_sort_commits.py
@@ -58,5 +58,6 @@ def main():
for c in commits:
print(c.sha1)
+
if __name__ == "__main__":
main()
diff --git a/utils/blender_theme_as_c.py b/utils/blender_theme_as_c.py
index c3cfb48a49e2b1b31da850c18399a47c03545898..5ba5f16ac43ef67cd401a903f07f7b57a8ba5216 100755
--- a/utils/blender_theme_as_c.py
+++ b/utils/blender_theme_as_c.py
@@ -307,6 +307,7 @@ def file_remove_empty_braces(source_dst):
# Remove:
# .foo = { }
import re
+
def key_replace(match):
return ""
data_prev = None
diff --git a/utils/cycles_commits_sync.py b/utils/cycles_commits_sync.py
index e61dacc800cedda889a48182bebefda79588ab11..001eff71e4cea5ce931897411ed6cfec2051dd67 100755
--- a/utils/cycles_commits_sync.py
+++ b/utils/cycles_commits_sync.py
@@ -14,11 +14,11 @@ import tempfile
# - Explicitly ignore some of the commits.
# - Move the synchronization point forward.
IGNORE_HASHES = {
- }
+}
# Start revisions from both repositories.
-CYCLES_START_COMMIT=b"c9ae7449faff"
-BLENDER_START_COMMIT=b"2dd0cb4964e8"
+CYCLES_START_COMMIT = b"c9ae7449faff"
+BLENDER_START_COMMIT = b"2dd0cb4964e8"
# Prefix which is common for all the subjects.
GIT_SUBJECT_COMMON_PREFIX = b"Subject: [PATCH] "
@@ -36,7 +36,7 @@ SUBJECT_SKIP_PREFIX = (
b"Cycles Standalone: ",
b"Cycles standalone: ",
b"cycles standalone: ",
- )
+)
def subject_strip(common_prefix, subject):
@@ -86,7 +86,7 @@ def cleanup_patch(patch, accept_prefix, replace_prefix):
elif line.startswith(GIT_PATCHSET_END_MARKER):
do_skip = False
elif line.startswith(b"---") or line.startswith(b"+++"):
- line = replace_file_prefix(line, accept_prefix, replace_prefix)
+ line = replace_file_prefix(line, accept_prefix, replace_prefix)
if not do_skip:
clean_content.append(line)
@@ -154,7 +154,7 @@ def transfer_commits(commit_hashes,
b"--start-number", str(patch_index),
b"-o", to_repository,
commit_hash,
- )
+ )
patch_file = subprocess.check_output(command).rstrip(b"\n")
if dst_is_cycles:
cleanup_patch(patch_file, b"intern/cycles", b"src")
@@ -183,5 +183,6 @@ def main():
print("")
print(" git am *.path")
+
if __name__ == '__main__':
main()
diff --git a/utils/git_log_review_commits.py b/utils/git_log_review_commits.py
index 03ea099e4df4a625f9cc63da05ff829dbab93074..4e16c720c3ba076c6f1a500c3d860a82ac3a5d5f 100755
--- a/utils/git_log_review_commits.py
+++ b/utils/git_log_review_commits.py
@@ -86,23 +86,23 @@ USE_COLOR = True
if USE_COLOR:
color_codes = {
- 'black': '\033[0;30m',
- 'bright_gray': '\033[0;37m',
- 'blue': '\033[0;34m',
- 'white': '\033[1;37m',
- 'green': '\033[0;32m',
- 'bright_blue': '\033[1;34m',
- 'cyan': '\033[0;36m',
- 'bright_green': '\033[1;32m',
- 'red': '\033[0;31m',
- 'bright_cyan': '\033[1;36m',
- 'purple': '\033[0;35m',
- 'bright_red': '\033[1;31m',
- 'yellow': '\033[0;33m',
+ 'black': '\033[0;30m',
+ 'bright_gray': '\033[0;37m',
+ 'blue': '\033[0;34m',
+ 'white': '\033[1;37m',
+ 'green': '\033[0;32m',
+ 'bright_blue': '\033[1;34m',
+ 'cyan': '\033[0;36m',
+ 'bright_green': '\033[1;32m',
+ 'red': '\033[0;31m',
+ 'bright_cyan': '\033[1;36m',
+ 'purple': '\033[0;35m',
+ 'bright_red': '\033[1;31m',
+ 'yellow': '\033[0;33m',
'bright_purple': '\033[1;35m',
- 'dark_gray': '\033[1;30m',
+ 'dark_gray': '\033[1;30m',
'bright_yellow': '\033[1;33m',
- 'normal': '\033[0m',
+ 'normal': '\033[0m',
}
def colorize(msg, color=None):
diff --git a/utils/git_log_review_commits_advanced.py b/utils/git_log_review_commits_advanced.py
index c43b4f192c60da2d99c1684fd9321da2bc3120aa..872b64c838bbcaa5d6686cd736dde8c1ac7a2355 100755
--- a/utils/git_log_review_commits_advanced.py
+++ b/utils/git_log_review_commits_advanced.py
@@ -126,23 +126,23 @@ USE_COLOR = True
if USE_COLOR:
color_codes = {
- 'black': '\033[0;30m',
- 'bright_gray': '\033[0;37m',
- 'blue': '\033[0;34m',
- 'white': '\033[1;37m',
- 'green': '\033[0;32m',
- 'bright_blue': '\033[1;34m',
- 'cyan': '\033[0;36m',
- 'bright_green': '\033[1;32m',
- 'red': '\033[0;31m',
- 'bright_cyan': '\033[1;36m',
- 'purple': '\033[0;35m',
- 'bright_red': '\033[1;31m',
- 'yellow': '\033[0;33m',
+ 'black': '\033[0;30m',
+ 'bright_gray': '\033[0;37m',
+ 'blue': '\033[0;34m',
+ 'white': '\033[1;37m',
+ 'green': '\033[0;32m',
+ 'bright_blue': '\033[1;34m',
+ 'cyan': '\033[0;36m',
+ 'bright_green': '\033[1;32m',
+ 'red': '\033[0;31m',
+ 'bright_cyan': '\033[1;36m',
+ 'purple': '\033[0;35m',
+ 'bright_red': '\033[1;31m',
+ 'yellow': '\033[0;33m',
'bright_purple': '\033[1;35m',
- 'dark_gray': '\033[1;30m',
+ 'dark_gray': '\033[1;30m',
'bright_yellow': '\033[1;33m',
- 'normal': '\033[0m',
+ 'normal': '\033[0m',
}
def colorize(msg, color=None):
@@ -245,7 +245,7 @@ def print_commit(c):
def gen_commit_log(c):
return "rB%s %s %-30s %s" % (c.sha1.decode()[:10], c.date.strftime("%Y/%m/%d"),
- c.author, gen_commit_summary(c))
+ c.author, gen_commit_summary(c))
re_bugify_str = r"T([0-9]{1,})"
diff --git a/utils/header_clean.py b/utils/header_clean.py
index 5b79ff6e46cd4b4def876ae969cdc692956b68ea..2d808c4b2d86408aa622a6cc74b01a58f8fda0f0 100755
--- a/utils/header_clean.py
+++ b/utils/header_clean.py
@@ -39,6 +39,8 @@ import subprocess
import re
# Copied form elsewhere...
+
+
def cmake_cache_var(cmake_dir, var):
cache_file = open(os.path.join(cmake_dir, "CMakeCache.txt"), encoding='utf-8')
lines = [l_strip for l in cache_file for l_strip in (l.strip(),)
@@ -50,6 +52,7 @@ def cmake_cache_var(cmake_dir, var):
return l.split("=", 1)[-1]
return None
+
# RE_CFILE_SEARCH = re.search('<title>(.*)</title>', html, re.IGNORECASE)
RE_CFILE_SEARCH = re.compile(r"\s\-c\s([\S]+)")
@@ -81,10 +84,10 @@ def find_build_args_ninja(build_dir):
cmake_dir = build_dir
make_exe = "ninja"
process = subprocess.Popen(
- [make_exe, "-t", "commands"],
- stdout=subprocess.PIPE,
- cwd=build_dir,
- )
+ [make_exe, "-t", "commands"],
+ stdout=subprocess.PIPE,
+ cwd=build_dir,
+ )
while process.poll():
time.sleep(1)
@@ -98,10 +101,10 @@ def find_build_args_ninja(build_dir):
def find_build_args_make(build_dir):
make_exe = "make"
process = subprocess.Popen(
- [make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
- stdout=subprocess.PIPE,
- cwd=build_dir,
- )
+ [make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"],
+ stdout=subprocess.PIPE,
+ cwd=build_dir,
+ )
while process.poll():
time.sleep(1)
@@ -145,7 +148,7 @@ def wash_source_const(pair):
'''
# for t in ("bool", "char", "short", "int", "long", "float", "double"):
- #if t in l_strip:
+ # if t in l_strip:
changed = True
while changed:
changed = False
@@ -262,7 +265,7 @@ def wash_source_include(pair):
while i < len(lines):
l = lines[i]
- #if "\"BKE_" not in l:
+ # if "\"BKE_" not in l:
# i += 1
# continue
m = re.match(re_c, l)
@@ -287,7 +290,6 @@ def wash_source_include(pair):
lines[i] = l_test
write_lines(lines)
-
# ensure this fails!, else we may be in an `#if 0` block
ret = os.system(build_args)
if ret != 0:
@@ -362,7 +364,6 @@ def header_clean_all(build_dir, regex_list):
return True
return False
-
if 1:
args = [(c, build_args) for (c, build_args) in args if test_path(c)]
@@ -416,4 +417,3 @@ def main():
if __name__ == "__main__":
sys.exit(main())
-
diff --git a/utils/make_cursor_gui.py b/utils/make_cursor_gui.py
index ab51c1ee06222a3475cecff0d924d0c3b0f5483b..5962d0b9b280a770df03aaf90c4870566362cd47 100755
--- a/utils/make_cursor_gui.py
+++ b/utils/make_cursor_gui.py
@@ -283,6 +283,7 @@ class App:
print("0x%(b1)02x, " % vars(), end=' ')
print("\n};")
+
################## Main App #######################
root = Tk()
diff --git a/utils/rna_manual_reference_updater.py b/utils/rna_manual_reference_updater.py
index 1b74f02672fe369fc4b3a8916082aa51cbabaf7c..dfd48a40eb6f72fa2b77559e73a3b5ebbd68c0b1 100644
--- a/utils/rna_manual_reference_updater.py
+++ b/utils/rna_manual_reference_updater.py
@@ -69,26 +69,26 @@ fw(" if language == 'DEFAULT':\n")
fw(" import os\n")
fw(" language = os.getenv('LANG', '').split('.')[0]\n\n")
fw("LANG = {\n")
-#fw(" \"ar_EG": \"ar",\n")
-#fw(" \"bg_BG": \"bg",\n")
-#fw(" \"ca_AD": \"ca",\n")
-#fw(" \"cs_CZ": \"cz",\n")
+# fw(" \"ar_EG": \"ar",\n")
+# fw(" \"bg_BG": \"bg",\n")
+# fw(" \"ca_AD": \"ca",\n")
+# fw(" \"cs_CZ": \"cz",\n")
fw(" \"de_DE\": \"de\",\n") # German
-#fw(" \"el_GR": \"el",\n")
+# fw(" \"el_GR": \"el",\n")
fw(" \"ru_RU\": \"ru\",\n") # Russian
-#fw(" \"sr_RS": \"sr",\n")
-#fw(" \"sv_SE": \"sv",\n")
-#fw(" \"tr_TR": \"th",\n")
-#fw(" \"uk_UA": \"uk",\n")
+# fw(" \"sr_RS": \"sr",\n")
+# fw(" \"sv_SE": \"sv",\n")
+# fw(" \"tr_TR": \"th",\n")
+# fw(" \"uk_UA": \"uk",\n")
fw(" \"es\": \"es\",\n") # Spanish
-#fw(" \"fi_FI": \"fi",\n")
+# fw(" \"fi_FI": \"fi",\n")
fw(" \"fr_FR\": \"fr\",\n") # French
-#fw(" \"id_ID": \"id",\n")
+# fw(" \"id_ID": \"id",\n")
fw(" \"it_IT\": \"it\",\n") # Italian
fw(" \"ja_JP\": \"ja\",\n") # Japanese
fw(" \"ko_KR\": \"ko\",\n") # Korean
-#fw(" \"nl_NL": \"nl",\n")
-#fw(" \"pl_PL": \"pl",\n")
+# fw(" \"nl_NL": \"nl",\n")
+# fw(" \"pl_PL": \"pl",\n")
fw(" \"pt_PT\": \"pt\",\n") # Portuguese
fw(" \"pt_BR\": \"pt\",\n") # Portuguese - for until we have a pt_BR version
fw(" \"zh_CN\": \"zh.cn\",\n") # Chinese - Should be changed to "zh_cn" but there is a bug in sphinx-intl
@@ -102,7 +102,7 @@ fw("url_manual_mapping = (\n")
# Logic to manipulate strings from objects.inv
with open("objects.tmp", encoding="utf8") as obj_tmp:
lines = [l for l in obj_tmp if (l.startswith("bpy.types") or l.startswith("bpy.ops"))]
- lines.sort(key=lambda l: l.find(" "), reverse=True) # Finding first space will return length of rna path...
+ lines.sort(key=lambda l: l.find(" "), reverse=True) # Finding first space will return length of rna path...
for line in lines:
split = line.split(" ")
fw("\t(\"" + split[0] + "*\", \"" + split[3] + "\"),\n")
diff --git a/utils_ide/qtcreator/externaltools/qtc_blender_diffusion.py b/utils_ide/qtcreator/externaltools/qtc_blender_diffusion.py
index 26348506b37f3b9931cdcc49eb2e85fe2332e91d..d5bd097ab5181da0e3f15ea7fd60293334b0f003 100755
--- a/utils_ide/qtcreator/externaltools/qtc_blender_diffusion.py
+++ b/utils_ide/qtcreator/externaltools/qtc_blender_diffusion.py
@@ -43,5 +43,6 @@ def main():
import webbrowser
webbrowser.open(url)
+
if __name__ == "__main__":
main()
diff --git a/utils_ide/qtcreator/externaltools/qtc_cpp_to_c_comments.py b/utils_ide/qtcreator/externaltools/qtc_cpp_to_c_comments.py
index 66cd447d950f71c2167453024bd05fc4b07a977d..b4ed1b060a1e1c73e4d480a29647ee0871b5eea6 100755
--- a/utils_ide/qtcreator/externaltools/qtc_cpp_to_c_comments.py
+++ b/utils_ide/qtcreator/externaltools/qtc_cpp_to_c_comments.py
@@ -52,6 +52,7 @@ def block_data(data, i_start):
# done with block comment, still go onto do regular replace
return max(i_end, i_start + 1)
+
i = 0
while i < len(data):
i = block_data(data, i)
diff --git a/utils_ide/qtcreator/externaltools/qtc_doxy_file.py b/utils_ide/qtcreator/externaltools/qtc_doxy_file.py
index 7e1fd80c13f4ccc0cdf405dc8b03e0e67fa19602..41aedef79faff45bc0ee2f46797d21a559b32801 100755
--- a/utils_ide/qtcreator/externaltools/qtc_doxy_file.py
+++ b/utils_ide/qtcreator/externaltools/qtc_doxy_file.py
@@ -21,6 +21,7 @@ def find_gitroot(filepath_reference):
path = os.path.dirname(path)
return path
+
doxyfile, sourcefile = sys.argv[-2:]
doxyfile = os.path.join(find_gitroot(sourcefile), doxyfile)
diff --git a/utils_ide/qtcreator/externaltools/qtc_project_update.py b/utils_ide/qtcreator/externaltools/qtc_project_update.py
index d708f5aa2d6737ced20eb31ab935baff2c6e8f77..8005f972b42dc92c1a6196b9d9d1913c38bb4344 100755
--- a/utils_ide/qtcreator/externaltools/qtc_project_update.py
+++ b/utils_ide/qtcreator/externaltools/qtc_project_update.py
@@ -23,6 +23,7 @@ def cmake_find_source(path):
return l[l.index("=") + 1:].strip()
return ""
+
SOURCE_DIR = cmake_find_source(PROJECT_DIR)
cmd = (