cacheprovider: type annotations

1 files changed, 3 insertions, 3 deletions

diff --git a/src/_pytest/pathlib.py b/src/_pytest/pathlib.py
index dd7443f07..6a0bf7f6f 100644
--- a/src/_pytest/pathlib.py
+++ b/src/_pytest/pathlib.py
@@ -363,15 +363,15 @@ def make_numbered_dir_with_cleanup(
     raise e
 
 
-def resolve_from_str(input: str, root):
+def resolve_from_str(input: str, root: py.path.local) -> Path:
     assert not isinstance(input, Path), "would break on py2"
-    root = Path(root)
+    rootpath = Path(root)
     input = expanduser(input)
     input = expandvars(input)
     if isabs(input):
         return Path(input)
     else:
-        return root.joinpath(input)
+        return rootpath.joinpath(input)
 
 
 def fnmatch_ex(pattern: str, path) -> bool: