Rewrite Item.location to be clearer with regard to types

blueyed · Jan 23, 2020 · 9dcdea5 · 9dcdea5
1 parent 0b6258a
commit 9dcdea5
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/_pytest/nodes.py b/src/_pytest/nodes.py
@@ -462,9 +462,10 @@ def reportinfo(self) -> Tuple[Union[py.path.local, str], Optional[int], str]:
     @cached_property
     def location(self) -> Tuple[str, Optional[int], str]:
         location = self.reportinfo()
-        fspath = location[0]
-        if not isinstance(fspath, py.path.local):
-            fspath = py.path.local(fspath)
-        fspath = self.session._node_location_to_relpath(fspath)
+        if isinstance(location[0], py.path.local):
+            fspath = location[0]
+        else:
+            fspath = py.path.local(location[0])
+        relfspath = self.session._node_location_to_relpath(fspath)
         assert type(location[2]) is str
-        return (fspath, location[1], location[2])
+        return (relfspath, location[1], location[2])