diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-03-02 09:15:55 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-03-03 15:56:08 +0100 |
| commit | 3d6c86ec574a7672ddc0ec67a4d1f5753e915004 (patch) | |
| tree | 899d110d5c0871b5f846f909277e03622e1b3db2 /util | |
| parent | 5495eb9ec25f086ec24cee2e062f9b1c16fe52e8 (diff) | |
pro2cmake: Fix static type errors in condition_simplifier_cache.py
Mypy reported the following:
condition_simplifier_cache.py:111: error: Argument 1 has incompatible type "*List[str]"; expected
"Optional[float]"
file_handle = file_open_func(*file_open_args, **file_open_kwargs)
^
condition_simplifier_cache.py:111: error: Argument 2 has incompatible type "**Dict[str, object]";
expected "Union[str, Path]"
file_handle = file_open_func(*file_open_args, **file_open_kwargs)
Fix by calling portalocker.Lock directly.
Change-Id: I538319791b1a4a1b6dffac0544d87c705e8809a7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'util')
| -rwxr-xr-x[-rw-r--r--] | util/cmake/condition_simplifier_cache.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/util/cmake/condition_simplifier_cache.py b/util/cmake/condition_simplifier_cache.py index 58cd5b88c5..2023649347 100644..100755 --- a/util/cmake/condition_simplifier_cache.py +++ b/util/cmake/condition_simplifier_cache.py @@ -105,11 +105,7 @@ def open_file_safe(file_path: str, mode: str = "r+"): try: import portalocker # type: ignore - file_open_func = portalocker.Lock - file_open_args = [file_path] - file_open_kwargs = {"mode": mode, "flags": portalocker.LOCK_EX} - file_handle = file_open_func(*file_open_args, **file_open_kwargs) - return file_handle + return portalocker.Lock(file_path, mode=mode, flags=portalocker.LOCK_EX) except ImportError: print( "The conversion script is missing a required package: portalocker. Please run " |