diff options
| author | Ran Benita <ran@unusedvar.com> | 2020-12-19 13:32:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-19 13:32:20 +0200 |
| commit | 89dcfbf293802b6efacc5aea2893f9fec03787bc (patch) | |
| tree | e90bd855cee38db47c0d9b7d510e2b0011a5433a /src | |
| parent | f14ab08de3d3ed840d111d111bd56122baa4224e (diff) | |
| parent | 196b173c8a86833b96f90128a6cc9928e17b6c23 (diff) | |
| download | pytest-89dcfbf293802b6efacc5aea2893f9fec03787bc.tar.gz | |
Merge pull request #8168 from antonblr/testdir-to-pytester-incr2
tests: Migrate to pytester - final update
Diffstat (limited to 'src')
| -rw-r--r-- | src/_pytest/nodes.py | 2 | ||||
| -rw-r--r-- | src/_pytest/python.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/_pytest/nodes.py b/src/_pytest/nodes.py index fee0770eb..1b3ec5571 100644 --- a/src/_pytest/nodes.py +++ b/src/_pytest/nodes.py @@ -528,7 +528,7 @@ class FSCollector(Collector): warnings.warn(FSCOLLECTOR_GETHOOKPROXY_ISINITPATH, stacklevel=2) return self.session.gethookproxy(fspath) - def isinitpath(self, path: py.path.local) -> bool: + def isinitpath(self, path: Union[str, "os.PathLike[str]"]) -> bool: warnings.warn(FSCOLLECTOR_GETHOOKPROXY_ISINITPATH, stacklevel=2) return self.session.isinitpath(path) diff --git a/src/_pytest/python.py b/src/_pytest/python.py index 18e449b93..3ff04455f 100644 --- a/src/_pytest/python.py +++ b/src/_pytest/python.py @@ -660,7 +660,7 @@ class Package(Module): warnings.warn(FSCOLLECTOR_GETHOOKPROXY_ISINITPATH, stacklevel=2) return self.session.gethookproxy(fspath) - def isinitpath(self, path: py.path.local) -> bool: + def isinitpath(self, path: Union[str, "os.PathLike[str]"]) -> bool: warnings.warn(FSCOLLECTOR_GETHOOKPROXY_ISINITPATH, stacklevel=2) return self.session.isinitpath(path) |