Skip to content

Commit 8b66b68

Browse files
committed
prefer stdlib TemporaryDirectory
1 parent 925424a commit 8b66b68

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

src/poetry/inspection/info.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import tempfile
88

99
from pathlib import Path
10+
from tempfile import TemporaryDirectory
1011
from typing import TYPE_CHECKING
1112
from typing import Any
1213
from typing import Mapping
@@ -21,7 +22,6 @@
2122
from poetry.core.packages.package import Package
2223
from poetry.core.pyproject.toml import PyProjectTOML
2324
from poetry.core.utils.helpers import parse_requires
24-
from poetry.core.utils.helpers import temporary_directory
2525
from poetry.core.version.markers import InvalidMarker
2626
from poetry.core.version.requirements import InvalidRequirement
2727

@@ -316,7 +316,7 @@ def _from_sdist_file(cls, path: Path) -> PackageInfo:
316316
elif not zip:
317317
suffix = ".tar.gz"
318318

319-
with temporary_directory() as tmp_str:
319+
with TemporaryDirectory(ignore_cleanup_errors=True) as tmp_str:
320320
tmp = Path(tmp_str)
321321
extractall(source=path, dest=tmp, zip=zip)
322322

src/poetry/installation/chef.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import tempfile
44

55
from pathlib import Path
6+
from tempfile import TemporaryDirectory
67
from typing import TYPE_CHECKING
78

89
from build import BuildBackendException
9-
from poetry.core.utils.helpers import temporary_directory
1010

1111
from poetry.utils._compat import decode
1212
from poetry.utils.helpers import extractall
@@ -87,7 +87,7 @@ def _prepare_sdist(self, archive: Path, destination: Path | None = None) -> Path
8787
suffix = archive.suffix
8888
zip = suffix == ".zip"
8989

90-
with temporary_directory() as tmp_dir:
90+
with TemporaryDirectory(ignore_cleanup_errors=True) as tmp_dir:
9191
archive_dir = Path(tmp_dir)
9292
extractall(source=archive, dest=archive_dir, zip=zip)
9393

src/poetry/repositories/http_repository.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from contextlib import contextmanager
77
from contextlib import suppress
88
from pathlib import Path
9+
from tempfile import TemporaryDirectory
910
from typing import TYPE_CHECKING
1011
from typing import Any
1112
from typing import Iterator
@@ -16,7 +17,7 @@
1617
from packaging.metadata import parse_email
1718
from poetry.core.constraints.version import parse_constraint
1819
from poetry.core.packages.dependency import Dependency
19-
from poetry.core.utils.helpers import temporary_directory
20+
from poetry.core.packages.utils.link import Link
2021
from poetry.core.version.markers import parse_marker
2122

2223
from poetry.config.config import Config
@@ -103,7 +104,7 @@ def _cached_or_downloaded_file(
103104
self, link: Link, *, raise_accepts_ranges: bool = False
104105
) -> Iterator[Path]:
105106
self._log(f"Downloading: {link.url}", level="debug")
106-
with temporary_directory() as temp_dir:
107+
with TemporaryDirectory(ignore_cleanup_errors=True) as temp_dir:
107108
filepath = Path(temp_dir) / link.filename
108109
self._download(
109110
link.url, filepath, raise_accepts_ranges=raise_accepts_ranges

src/poetry/utils/env/__init__.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
from contextlib import contextmanager
44
from pathlib import Path
5+
from tempfile import TemporaryDirectory
56
from typing import TYPE_CHECKING
67

7-
from poetry.core.utils.helpers import temporary_directory
8-
98
from poetry.utils.env.base_env import Env
109
from poetry.utils.env.env_manager import EnvManager
1110
from poetry.utils.env.exceptions import EnvCommandError
@@ -44,7 +43,7 @@ def ephemeral_environment(
4443
executable: Path | None = None,
4544
flags: dict[str, str | bool] | None = None,
4645
) -> Iterator[VirtualEnv]:
47-
with temporary_directory() as tmp_dir:
46+
with TemporaryDirectory(ignore_cleanup_errors=True) as tmp_dir:
4847
# TODO: cache PEP 517 build environment corresponding to each project venv
4948
venv_dir = Path(tmp_dir) / ".venv"
5049
EnvManager.build_venv(

tests/packages/test_locker.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,11 +1120,13 @@ def test_lock_file_resolves_file_url_symlinks(root: ProjectPackage) -> None:
11201120
11211121
See https://github.com/python-poetry/poetry/issues/5849
11221122
"""
1123-
with tempfile.TemporaryDirectory() as d1:
1123+
with tempfile.TemporaryDirectory(ignore_cleanup_errors=True) as d1:
11241124
symlink_path = Path(d1).joinpath("testsymlink")
1125-
with tempfile.TemporaryDirectory(dir=d1) as d2, tempfile.TemporaryDirectory(
1126-
dir=d1
1127-
) as d4, tempfile.TemporaryDirectory(dir=d2) as d3, tempfile.NamedTemporaryFile(
1125+
with tempfile.TemporaryDirectory(
1126+
dir=d1, ignore_cleanup_errors=True
1127+
) as d2, tempfile.TemporaryDirectory(dir=d1) as d4, tempfile.TemporaryDirectory(
1128+
dir=d2, ignore_cleanup_errors=True
1129+
) as d3, tempfile.NamedTemporaryFile(
11281130
dir=d4
11291131
) as source_file, tempfile.NamedTemporaryFile(dir=d3) as lock_file:
11301132
lock_file.close()

0 commit comments

Comments
 (0)