Fix linting

pytest-dev · Dec 19, 2020 · 173fd6e · 173fd6e
1 parent a2aa292
commit 173fd6e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/_pytest/doctest.py b/src/_pytest/doctest.py
@@ -526,7 +526,9 @@ def _find(
 
         if self.fspath.basename == "conftest.py":
             module = self.config.pluginmanager._importconftest(
-                Path(self.fspath), self.config.getoption("importmode"),rootpath=self.config.rootpath
+                Path(self.fspath),
+                self.config.getoption("importmode"),
+                rootpath=self.config.rootpath,
             )
         else:
             try:

diff --git a/src/_pytest/main.py b/src/_pytest/main.py
@@ -372,7 +372,9 @@ def _in_venv(path: py.path.local) -> bool:
 
 def pytest_ignore_collect(path: py.path.local, config: Config) -> Optional[bool]:
     path_ = Path(path)
-    ignore_paths = config._getconftest_pathlist("collect_ignore", path=path_.parent, rootpath=config.rootpath)
+    ignore_paths = config._getconftest_pathlist(
+        "collect_ignore", path=path_.parent, rootpath=config.rootpath
+    )
     ignore_paths = ignore_paths or []
     excludeopt = config.getoption("ignore")
     if excludeopt:
@@ -518,7 +520,9 @@ def gethookproxy(self, fspath: "os.PathLike[str]"):
         # hooks with all conftest.py files.
         pm = self.config.pluginmanager
         my_conftestmodules = pm._getconftestmodules(
-            Path(fspath), self.config.getoption("importmode"), rootpath=self.config.rootpath
+            Path(fspath),
+            self.config.getoption("importmode"),
+            rootpath=self.config.rootpath,
         )
         remove_mods = pm._conftest_plugins.difference(my_conftestmodules)
         if remove_mods:

diff --git a/testing/test_config.py b/testing/test_config.py
@@ -579,8 +579,14 @@ def test_getconftest_pathlist(self, pytester: Pytester, tmp_path: Path) -> None:
         p = tmp_path.joinpath("conftest.py")
         p.write_text(f"pathlist = ['.', {str(somepath)!r}]")
         config = pytester.parseconfigure(p)
-        assert config._getconftest_pathlist("notexist", path=tmp_path, rootpath=tmp_path) is None
-        pl = config._getconftest_pathlist("pathlist", path=tmp_path, rootpath=tmp_path) or []
+        assert (
+            config._getconftest_pathlist("notexist", path=tmp_path, rootpath=tmp_path)
+            is None
+        )
+        pl = (
+            config._getconftest_pathlist("pathlist", path=tmp_path, rootpath=tmp_path)
+            or []
+        )
         print(pl)
         assert len(pl) == 2
         assert pl[0] == tmp_path