Skip to content

Commit c787fcb

Browse files
authored
Merge pull request #7064 from pradyunsg/rename-correct-build-location
Better name for _correct_build_directory
2 parents 359a670 + 596b77c commit c787fcb

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/pip/_internal/req/req_install.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def __init__(
131131
# Temporary build location
132132
self._temp_build_dir = None # type: Optional[TempDirectory]
133133
# Used to store the global directory where the _temp_build_dir should
134-
# have been created. Cf _correct_build_location method.
134+
# have been created. Cf move_to_correct_build_directory method.
135135
self._ideal_build_dir = None # type: Optional[str]
136136
# Set to True after successful installation
137137
self.install_succeeded = None # type: Optional[bool]
@@ -332,8 +332,8 @@ def ensure_build_location(self, build_dir):
332332
if self.req is None:
333333
# for requirement via a path to a directory: the name of the
334334
# package is not available yet so we create a temp directory
335-
# Once run_egg_info will have run, we'll be able
336-
# to fix it via _correct_build_location
335+
# Once run_egg_info will have run, we'll be able to fix it via
336+
# move_to_correct_build_directory().
337337
# Some systems have /tmp as a symlink which confuses custom
338338
# builds (such as numpy). Thus, we ensure that the real path
339339
# is returned.
@@ -353,16 +353,16 @@ def ensure_build_location(self, build_dir):
353353
_make_build_dir(build_dir)
354354
return os.path.join(build_dir, name)
355355

356-
def _correct_build_location(self):
356+
def move_to_correct_build_directory(self):
357357
# type: () -> None
358-
"""Move self._temp_build_dir to self._ideal_build_dir/self.req.name
358+
"""Move self._temp_build_dir to "self._ideal_build_dir/self.req.name"
359359
360360
For some requirements (e.g. a path to a directory), the name of the
361361
package is not available until we run egg_info, so the build_location
362362
will return a temporary directory and store the _ideal_build_dir.
363363
364-
This is only called by self.run_egg_info to fix the temporary build
365-
directory.
364+
This is only called to "fix" the build directory after generating
365+
metadata.
366366
"""
367367
if self.source_dir is not None:
368368
return
@@ -583,7 +583,7 @@ def prepare_metadata(self):
583583
self.metadata["Version"],
584584
])
585585
)
586-
self._correct_build_location()
586+
self.move_to_correct_build_directory()
587587
else:
588588
metadata_name = canonicalize_name(self.metadata["Name"])
589589
if canonicalize_name(self.req.name) != metadata_name:

0 commit comments

Comments
 (0)