floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reshape typing for hook invocation proxying

This commit is contained in:
Ronny Pfannschmidt 2021-03-20 23:01:18 +01:00
parent a550db4b6c
commit 2994022753
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/_pytest/config/compat.py
View File

@ -1,12 +1,9 @@
from typing import TYPE_CHECKING
from _pytest.nodes import _imply_path
if TYPE_CHECKING:
from ..compat import LEGACY_PATH
import functools import functools
from pathlib import Path
from typing import Optional
from ..compat import LEGACY_PATH
from _pytest.nodes import _imply_path
# hookname: (Path, LEGACY_PATH) # hookname: (Path, LEGACY_PATH)
imply_paths_hooks = { imply_paths_hooks = {
@ -31,8 +28,8 @@ class PathAwareHookProxy:
@functools.wraps(hook) @functools.wraps(hook)
def fixed_hook(**kw): def fixed_hook(**kw):
path_value = kw.pop(path_var, None) path_value: Optional[Path] = kw.pop(path_var, None)
fspath_value: "LEGACY_PATH" = kw.pop(fspath_var, None) fspath_value: Optional[LEGACY_PATH] = kw.pop(fspath_var, None)
path_value, fspath_value = _imply_path(path_value, fspath_value) path_value, fspath_value = _imply_path(path_value, fspath_value)
kw[path_var] = path_value kw[path_var] = path_value
kw[fspath_var] = fspath_value kw[fspath_var] = fspath_value