Skip to content

Commit 48609dc

Browse files
chrahuntchrahunt
committed
Unconditionally create TempDirectory.path
1 parent 92e9748 commit 48609dc

File tree

8 files changed

+16
-38
lines changed

8 files changed

+16
-38
lines changed

‎src/pip/_internal/build_env.py

-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ class BuildEnvironment(object):
5454
def __init__(self):
5555
# type: () -> None
5656
self._temp_dir = TempDirectory(kind="build-env")
57-
self._temp_dir.create()
5857

5958
self._prefixes = OrderedDict((
6059
(name, _Prefix(os.path.join(self._temp_dir.path, name)))

‎src/pip/_internal/cache.py

-1
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,6 @@ class EphemWheelCache(SimpleWheelCache):
193193
def __init__(self, format_control):
194194
# type: (FormatControl) -> None
195195
self._temp_dir = TempDirectory(kind="ephem-wheel-cache")
196-
self._temp_dir.create()
197196

198197
super(EphemWheelCache, self).__init__(
199198
self._temp_dir.path, format_control

‎src/pip/_internal/commands/install.py

-1
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ def run(self, options, args):
318318

319319
# Create a target directory for using with the target option
320320
target_temp_dir = TempDirectory(kind="target")
321-
target_temp_dir.create()
322321
target_temp_dir_path = target_temp_dir.path
323322
install_options.append('--home=' + target_temp_dir_path)
324323

‎src/pip/_internal/req/req_install.py

-2
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ def ensure_build_location(self, build_dir):
337337
# builds (such as numpy). Thus, we ensure that the real path
338338
# is returned.
339339
self._temp_build_dir = TempDirectory(kind="req-build")
340-
self._temp_build_dir.create()
341340
self._ideal_build_dir = build_dir
342341

343342
return self._temp_build_dir.path
@@ -607,7 +606,6 @@ def prepare_pep517_metadata(self):
607606

608607
# NOTE: This needs to be refactored to stop using atexit
609608
self._temp_dir = TempDirectory(delete=False, kind="req-install")
610-
self._temp_dir.create()
611609
metadata_dir = os.path.join(
612610
self._temp_dir.path,
613611
'pip-wheel-metadata',

‎src/pip/_internal/req/req_tracker.py

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ def __init__(self):
2828
self._root = os.environ.get('PIP_REQ_TRACKER')
2929
if self._root is None:
3030
self._temp_dir = TempDirectory(delete=False, kind='req-tracker')
31-
self._temp_dir.create()
3231
self._root = os.environ['PIP_REQ_TRACKER'] = self._temp_dir.path
3332
logger.debug('Created requirements tracker %r', self._root)
3433
else:

‎src/pip/_internal/req/req_uninstall.py

-3
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,8 @@ def _get_directory_stash(self, path):
227227

228228
try:
229229
save_dir = AdjacentTempDirectory(path) # type: TempDirectory
230-
save_dir.create()
231230
except OSError:
232231
save_dir = TempDirectory(kind="uninstall")
233-
save_dir.create()
234232
self._save_dirs[os.path.normcase(path)] = save_dir
235233

236234
return save_dir.path
@@ -256,7 +254,6 @@ def _get_file_stash(self, path):
256254
# Did not find any suitable root
257255
head = os.path.dirname(path)
258256
save_dir = TempDirectory(kind='uninstall')
259-
save_dir.create()
260257
self._save_dirs[head] = save_dir
261258

262259
relpath = os.path.relpath(path, head)

‎src/pip/_internal/utils/temp_dir.py

+13-24
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,17 @@ class TempDirectory(object):
1919
2020
Attributes:
2121
path
22-
Location to the created temporary directory or None
22+
Location to the created temporary directory
2323
delete
2424
Whether the directory should be deleted when exiting
2525
(when used as a contextmanager)
2626
2727
Methods:
28-
create()
29-
Creates a temporary directory and stores its path in the path
30-
attribute.
3128
cleanup()
32-
Deletes the temporary directory and sets path attribute to None
29+
Deletes the temporary directory
3330
34-
When used as a context manager, a temporary directory is created on
35-
entering the context and, if the delete attribute is True, on exiting the
36-
context the created directory is deleted.
31+
When used as a context manager, if the delete attribute is True, on
32+
exiting the context the temporary directory is deleted.
3733
"""
3834

3935
def __init__(self, path=None, delete=None, kind="temp"):
@@ -44,6 +40,9 @@ def __init__(self, path=None, delete=None, kind="temp"):
4440
# an explicit delete option, then we'll default to deleting.
4541
delete = True
4642

43+
if path is None:
44+
path = self._create(kind)
45+
4746
self.path = path
4847
self.delete = delete
4948
self.kind = kind
@@ -52,40 +51,30 @@ def __repr__(self):
5251
return "<{} {!r}>".format(self.__class__.__name__, self.path)
5352

5453
def __enter__(self):
55-
self.create()
5654
return self
5755

5856
def __exit__(self, exc, value, tb):
5957
if self.delete:
6058
self.cleanup()
6159

62-
def create(self):
63-
self.path = self._create()
64-
65-
def _create(self):
60+
def _create(self, kind):
6661
"""Create a temporary directory and store its path in self.path
6762
"""
68-
if self.path is not None:
69-
logger.debug(
70-
"Skipped creation of temporary directory: {}".format(self.path)
71-
)
72-
return self.path
7363
# We realpath here because some systems have their default tmpdir
7464
# symlinked to another directory. This tends to confuse build
7565
# scripts, so we canonicalize the path by traversing potential
7666
# symlinks here.
7767
path = os.path.realpath(
78-
tempfile.mkdtemp(prefix="pip-{}-".format(self.kind))
68+
tempfile.mkdtemp(prefix="pip-{}-".format(kind))
7969
)
8070
logger.debug("Created temporary directory: {}".format(path))
8171
return path
8272

8373
def cleanup(self):
8474
"""Remove the temporary directory created and reset state
8575
"""
86-
if self.path is not None and os.path.exists(self.path):
76+
if os.path.exists(self.path):
8777
rmtree(self.path)
88-
self.path = None
8978

9079

9180
class AdjacentTempDirectory(TempDirectory):
@@ -110,8 +99,8 @@ class AdjacentTempDirectory(TempDirectory):
11099
LEADING_CHARS = "-~.=%0123456789"
111100

112101
def __init__(self, original, delete=None):
113-
super(AdjacentTempDirectory, self).__init__(delete=delete)
114102
self.original = original.rstrip('/\\')
103+
super(AdjacentTempDirectory, self).__init__(delete=delete)
115104

116105
@classmethod
117106
def _generate_names(cls, name):
@@ -137,7 +126,7 @@ def _generate_names(cls, name):
137126
if new_name != name:
138127
yield new_name
139128

140-
def _create(self):
129+
def _create(self, kind):
141130
root, name = os.path.split(self.original)
142131
for candidate in self._generate_names(name):
143132
path = os.path.join(root, candidate)
@@ -153,7 +142,7 @@ def _create(self):
153142
else:
154143
# Final fallback on the default behavior.
155144
path = os.path.realpath(
156-
tempfile.mkdtemp(prefix="pip-{}-".format(self.kind))
145+
tempfile.mkdtemp(prefix="pip-{}-".format(kind))
157146
)
158147

159148
logger.debug("Created temporary directory: {}".format(path))

‎tests/unit/test_utils.py

+3-5
Original file line numberDiff line numberDiff line change
@@ -588,19 +588,17 @@ def readonly_file(*args):
588588
create_file(tmp_dir.path, "subfolder", "readonly-file")
589589
readonly_file(tmp_dir.path, "subfolder", "readonly-file")
590590

591-
assert tmp_dir.path is None
591+
assert not os.path.exists(tmp_dir.path)
592592

593593
def test_create_and_cleanup_work(self):
594594
tmp_dir = TempDirectory()
595-
assert tmp_dir.path is None
596-
597-
tmp_dir.create()
598595
created_path = tmp_dir.path
596+
599597
assert tmp_dir.path is not None
600598
assert os.path.exists(created_path)
601599

602600
tmp_dir.cleanup()
603-
assert tmp_dir.path is None
601+
assert tmp_dir.path is not None
604602
assert not os.path.exists(created_path)
605603

606604
@pytest.mark.parametrize("name", [

0 commit comments

Comments
 (0)