Merge pull request #749 from Faless/ci/4.x_black

pull/748/head
Rémi Verschelde 2022-05-03 09:19:42 +02:00 committed by GitHub
commit 1ad24f1d5d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 3 deletions

View File

@ -179,7 +179,12 @@ jobs:
sudo apt-get install -qq dos2unix recode clang-format-11 sudo apt-get install -qq dos2unix recode clang-format-11
sudo update-alternatives --remove-all clang-format sudo update-alternatives --remove-all clang-format
sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-11 100 sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-11 100
python -m pip install black==22.3.0
- name: Style checks via clang-format - name: Style checks via clang-format
run: | run: |
bash ./misc/scripts/clang_format.sh bash ./misc/scripts/clang_format.sh
- name: Python style checks via black (black_format.sh)
run: |
bash ./misc/scripts/black_format.sh

View File

@ -81,7 +81,7 @@ else:
env = Environment(ENV=os.environ) env = Environment(ENV=os.environ)
is64 = sys.maxsize > 2 ** 32 is64 = sys.maxsize > 2**32
if ( if (
env["TARGET_ARCH"] == "amd64" env["TARGET_ARCH"] == "amd64"
or env["TARGET_ARCH"] == "emt64" or env["TARGET_ARCH"] == "emt64"

View File

@ -1132,9 +1132,13 @@ def generate_engine_class_source(class_api, used_classes, fully_used_classes, us
is_ref = True is_ref = True
else: else:
if method["is_static"]: if method["is_static"]:
method_call += f"return internal::_call_native_mb_ret_obj<{return_type}>(___method_bind, nullptr" method_call += (
f"return internal::_call_native_mb_ret_obj<{return_type}>(___method_bind, nullptr"
)
else: else:
method_call += f"return internal::_call_native_mb_ret_obj<{return_type}>(___method_bind, _owner" method_call += (
f"return internal::_call_native_mb_ret_obj<{return_type}>(___method_bind, _owner"
)
else: else:
if method["is_static"]: if method["is_static"]:
method_call += f"internal::_call_native_mb_no_ret(___method_bind, nullptr" method_call += f"internal::_call_native_mb_no_ret(___method_bind, nullptr"