highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-26 22:08:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: fix PEP484 no implicit optional argument types errors

Browse Source 
Fix warnings for these files when ./test/lint/lint-python.py is run using
mypy 0.991 (released 11/2022) and later:

$ test/lint/lint-python.py
test/functional/test_framework/coverage.py:23: error: Incompatible default for argument "coverage_logfile" (default has type "None", argument has type "str")  [assignment]
test/functional/test_framework/coverage.py:23: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True
test/functional/test_framework/util.py:318: error: Incompatible default for argument "timeout" (default has type "None", argument has type "int")  [assignment]
test/functional/test_framework/util.py:318: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True
test/functional/test_framework/util.py:318: error: Incompatible default for argument "coveragedir" (default has type "None", argument has type "str")  [assignment]
test/functional/interface_rest.py:67: error: Incompatible default for argument "query_params" (default has type "None", argument has type "dict[str, Any]")  [assignment]
test/functional/interface_rest.py:67: note: PEP 484 prohibits implicit Optional. Accordingly, mypy has changed its default to no_implicit_optional=True

Verified using https://github.com/hauntsaninja/no_implicit_optional

For details, see:

https://mypy-lang.blogspot.com/2022/11/mypy-0990-released.html
This commit is contained in:
Jon Atack
2023-06-29 15:18:49 -06:00
parent f86a301433
commit 92408224a4
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/functional/interface_rest.py
View File

@@ -26,6 +26,7 @@ from test_framework.wallet import (
MiniWallet, MiniWallet,
getnewdestination, getnewdestination,
) )
from typing import Optional
INVALID_PARAM = "abc" INVALID_PARAM = "abc"
@@ -64,7 +65,7 @@ class RESTTest (BitcoinTestFramework):
body: str = '', body: str = '',
status: int = 200, status: int = 200,
ret_type: RetType = RetType.JSON, ret_type: RetType = RetType.JSON,
query_params: typing.Dict[str, typing.Any] = None, query_params: Optional[typing.Dict[str, typing.Any]] = None,
) -> typing.Union[http.client.HTTPResponse, bytes, str, None]: ) -> typing.Union[http.client.HTTPResponse, bytes, str, None]:
rest_uri = '/rest' + uri rest_uri = '/rest' + uri
if req_type in ReqType: if req_type in ReqType:

3
test/functional/test_framework/coverage.py
View File

@@ -11,6 +11,7 @@ testing.
import os import os
from .authproxy import AuthServiceProxy from .authproxy import AuthServiceProxy
from typing import Optional
REFERENCE_FILENAME = 'rpc_interface.txt' REFERENCE_FILENAME = 'rpc_interface.txt'
@@ -20,7 +21,7 @@ class AuthServiceProxyWrapper():
An object that wraps AuthServiceProxy to record specific RPC calls. An object that wraps AuthServiceProxy to record specific RPC calls.
""" """
def __init__(self, auth_service_proxy_instance: AuthServiceProxy, rpc_url: str, coverage_logfile: str=None): def __init__(self, auth_service_proxy_instance: AuthServiceProxy, rpc_url: str, coverage_logfile: Optional[str]=None):
""" """
Kwargs: Kwargs:
auth_service_proxy_instance: the instance being wrapped. auth_service_proxy_instance: the instance being wrapped.

2
test/functional/test_framework/util.py
View File

@@ -309,7 +309,7 @@ class PortSeed:
n = None n = None
def get_rpc_proxy(url: str, node_number: int, *, timeout: int=None, coveragedir: str=None) -> coverage.AuthServiceProxyWrapper: def get_rpc_proxy(url: str, node_number: int, *, timeout: Optional[int]=None, coveragedir: Optional[str]=None) -> coverage.AuthServiceProxyWrapper:
""" """
Args: Args:
url: URL of the RPC server to call url: URL of the RPC server to call