Merge pull request #7292 from kerizane/7259_iniconfig

Author: nicoddemus

changelog/7291.trivial.rst

@@ -0,0 +1 @@
+Replaced ``py.iniconfig`` with `iniconfig <https://pypi.org/project/iniconfig/>`__.

setup.py

@@ -12,6 +12,7 @@
     'colorama;sys_platform=="win32"',
     "pluggy>=0.12,<1.0",
     'importlib-metadata>=0.12;python_version<"3.8"',
+    "iniconfig",
 ]
 
 

src/_pytest/config/findpaths.py

@@ -6,6 +6,8 @@
 from typing import Tuple
 
 import py
+from iniconfig import IniConfig
+from iniconfig import ParseError
 
 from .exceptions import UsageError
 from _pytest.compat import TYPE_CHECKING
@@ -40,8 +42,8 @@ def getcfg(args, config=None):
                 p = base.join(inibasename)
                 if exists(p):
                     try:
-                        iniconfig = py.iniconfig.IniConfig(p)
-                    except py.iniconfig.ParseError as exc:
+                        iniconfig = IniConfig(p)
+                    except ParseError as exc:
                         raise UsageError(str(exc))
 
                     if (
@@ -119,7 +121,7 @@ def determine_setup(
 ) -> Tuple[py.path.local, Optional[str], Any]:
     dirs = get_dirs_from_args(args)
     if inifile:
-        iniconfig = py.iniconfig.IniConfig(inifile)
+        iniconfig = IniConfig(inifile)
         is_cfg_file = str(inifile).endswith(".cfg")
         sections = ["tool:pytest", "pytest"] if is_cfg_file else ["pytest"]
         for section in sections:

src/_pytest/pytester.py

@@ -21,6 +21,7 @@
 from weakref import WeakKeyDictionary
 
 import py
+from iniconfig import IniConfig
 
 import pytest
 from _pytest import timing
@@ -683,7 +684,7 @@ def makeini(self, source):
     def getinicfg(self, source):
         """Return the pytest section from the tox.ini config file."""
         p = self.makeini(source)
-        return py.iniconfig.IniConfig(p)["pytest"]
+        return IniConfig(p)["pytest"]
 
     def makepyfile(self, *args, **kwargs):
         r"""Shortcut for .makefile() with a .py extension.