McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

fix typing

Browse source
This commit is contained in:
q0w 2023-03-31 11:48:11 +03:00
parent 6ea91c84c2
commit ae23fc2154
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/pip/_internal/utils/misc.py
View file

@ -734,7 +734,7 @@ class ConfiguredBuildBackendHookCaller(BuildBackendHookCaller):
def merge_config_settings(
reqs_settings: Optional[Dict[str, Union[str, List[str]]]],
cli_settings: Optional[Dict[str, Union[str, List[str]]]],
) -> Dict[str, Union[str, List[str]]]:
) -> Optional[Dict[str, Union[str, List[str]]]]:
if not reqs_settings or not cli_settings:
return reqs_settings or cli_settings

3
tests/unit/test_utils_misc.py
View file

@ -15,11 +15,12 @@ from pip._internal.utils.misc import merge_config_settings
({"foo": "bar"}, {"foo": ["baz"]}, {"foo": ["bar", "baz"]}),
({"foo": "bar"}, None, {"foo": "bar"}),
(None, {"foo": ["bar"]}, {"foo": ["bar"]}),
(None, None, None),
],
)
def test_merge_config_settings(
reqs: Optional[Dict[str, Union[str, List[str]]]],
cli: Optional[Dict[str, Union[str, List[str]]]],
expected: Dict[str, Union[str, List[str]]],
expected: Optional[Dict[str, Union[str, List[str]]]],
) -> None:
assert merge_config_settings(reqs, cli) == expected