Use internal version of make_numbered_dir

(cherry picked from commit 678440e)

Conflicts:
	src/_pytest/pytester/__init__.py

AUTHORS

@@ -148,6 +148,7 @@ Kale Kundert
 Karl O. Pinc
 Katarzyna Jachim
 Katerina Koukiou
+Keri Volans
 Kevin Cox
 Kevin J. Foley
 Kodi B. Arfer

src/_pytest/pytester/__init__.py

@@ -48,13 +48,13 @@
 from _pytest.nodes import Item
 from _pytest.outcomes import Failed
 from _pytest.pathlib import _shorten_path
+from _pytest.pathlib import make_numbered_dir
 from _pytest.pathlib import Path
 from _pytest.python import Function
 from _pytest.python import Module
 from _pytest.reports import TestReport
 from _pytest.tmpdir import TempdirFactory
 
-
 if TYPE_CHECKING:
     from typing import Type
     from typing_extensions import Literal  # noqa: F401
@@ -1468,9 +1468,7 @@ def runpytest_subprocess(self, *args, stdin=CLOSE_STDIN, timeout=None) -> RunRes
         Returns a :py:class:`RunResult`.
         """
         __tracebackhide__ = True
-        p = py.path.local.make_numbered_dir(
-            prefix="runpytest-", keep=None, rootdir=self.tmpdir
-        )
+        p = make_numbered_dir(root=Path(self.tmpdir), prefix="runpytest-")
         args = ("--basetemp=%s" % p,) + args
         plugins = [x for x in self.plugins if isinstance(x, str)]
         if plugins:

testing/test_assertrewrite.py

@@ -10,8 +10,6 @@
 import zipfile
 from functools import partial
 
-import py
-
 import _pytest._code
 import pytest
 from _pytest.assertion import util
@@ -22,6 +20,7 @@
 from _pytest.assertion.rewrite import PYTEST_TAG
 from _pytest.assertion.rewrite import rewrite_asserts
 from _pytest.config import ExitCode
+from _pytest.pathlib import make_numbered_dir
 from _pytest.pathlib import Path
 from _pytest.pytester import Testdir
 
@@ -823,9 +822,7 @@ def test_optimized():
                 "hello"
                 assert test_optimized.__doc__ is None"""
         )
-        p = py.path.local.make_numbered_dir(
-            prefix="runpytest-", keep=None, rootdir=testdir.tmpdir
-        )
+        p = make_numbered_dir(root=Path(testdir.tmpdir), prefix="runpytest-")
         tmp = "--basetemp=%s" % p
         monkeypatch.setenv("PYTHONOPTIMIZE", "2")
         monkeypatch.delenv("PYTHONDONTWRITEBYTECODE", raising=False)