Skip to content

FSCollector: keep/use given fspath #6119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 6, 2019
Merged

FSCollector: keep/use given fspath #6119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/_pytest/nodes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,8 +364,9 @@ def _check_initialpaths_for_relpath(session, fspath):


class FSCollector(Collector):
def __init__(self, fspath, parent=None, config=None, session=None, nodeid=None):
fspath = py.path.local(fspath) # xxx only for test_resultlog.py?
def __init__(
self, fspath: py.path.local, parent=None, config=None, session=None, nodeid=None
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bluetech
Here the fspath: py.path.local slipped in - JFI (via #6129 - where I've removed it somewhere else after your review).
However, it might be good for documentation, and/or if we should ever add typing info for it.

) -> None:
name = fspath.basename
if parent is not None:
rel = fspath.relto(parent.fspath)
Expand Down