diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-03-31 00:17:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 00:17:51 +0200 |
| commit | dfed5efea3b5646cfca6662e52cf20c54558eb42 (patch) | |
| tree | a15e6904f8d47ab2427f48bd67e965c9fc37f20d | |
| parent | 2becffd4e8c9ee3f961f00c36be6ba447bbea845 (diff) | |
| parent | 619354fb2c9dd046d37221a3a5041dda47135e3e (diff) | |
Merge pull request #37445 from nekomatata/hook-makerst-fix
Fixed errors in makerst pre-commit hook
| -rwxr-xr-x | doc/tools/makerst.py | 2 | ||||
| -rwxr-xr-x | misc/hooks/pre-commit-makerst | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/tools/makerst.py b/doc/tools/makerst.py index 417fe59278..9de5eac31d 100755 --- a/doc/tools/makerst.py +++ b/doc/tools/makerst.py @@ -353,7 +353,7 @@ def make_rst_class(class_def, state, dry_run, output_dir): # type: (ClassDef, S class_name = class_def.name if dry_run: - f = open(os.devnull, "w") + f = open(os.devnull, "w", encoding="utf-8") else: f = open(os.path.join(output_dir, "class_" + class_name.lower() + ".rst"), "w", encoding="utf-8") diff --git a/misc/hooks/pre-commit-makerst b/misc/hooks/pre-commit-makerst index d9b684e73b..b990788b99 100755 --- a/misc/hooks/pre-commit-makerst +++ b/misc/hooks/pre-commit-makerst @@ -2,4 +2,11 @@ # Git pre-commit hook that checks the class reference syntax using makerst.py. -doc/tools/makerst.py doc/classes modules --dry-run +# Workaround because we can't execute the .py file directly on windows +PYTHON=python +py_ver=$($PYTHON -c "import sys; print(sys.version_info.major)") +if [[ "$py_ver" != "3" ]]; then + PYTHON+=3 +fi + +$PYTHON doc/tools/makerst.py doc/classes modules --dry-run |