Skip to content

Commit c522381

Browse files
authored
Rename InstallationCandidate.{project -> name} (#7328)
2 parents df47abf + 9b25cd5 commit c522381

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

src/pip/_internal/index/package_finder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ def get_install_candidate(self, link_evaluator, link):
759759
return None
760760

761761
return InstallationCandidate(
762-
project=link_evaluator.project_name,
762+
name=link_evaluator.project_name,
763763
link=link,
764764
# Convert the Text result to str since InstallationCandidate
765765
# accepts str.

src/pip/_internal/models/candidate.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,30 @@
99
if MYPY_CHECK_RUNNING:
1010
from pip._vendor.packaging.version import _BaseVersion
1111
from pip._internal.models.link import Link
12-
from typing import Any
1312

1413

1514
class InstallationCandidate(KeyBasedCompareMixin):
1615
"""Represents a potential "candidate" for installation.
1716
"""
1817

19-
def __init__(self, project, version, link):
20-
# type: (Any, str, Link) -> None
21-
self.project = project
18+
def __init__(self, name, version, link):
19+
# type: (str, str, Link) -> None
20+
self.name = name
2221
self.version = parse_version(version) # type: _BaseVersion
2322
self.link = link
2423

2524
super(InstallationCandidate, self).__init__(
26-
key=(self.project, self.version, self.link),
25+
key=(self.name, self.version, self.link),
2726
defining_class=InstallationCandidate
2827
)
2928

3029
def __repr__(self):
3130
# type: () -> str
3231
return "<InstallationCandidate({!r}, {!r}, {!r})>".format(
33-
self.project, self.version, self.link,
32+
self.name, self.version, self.link,
3433
)
3534

3635
def __str__(self):
3736
return '{!r} candidate (version {} at {})'.format(
38-
self.project, self.version, self.link,
37+
self.name, self.version, self.link,
3938
)

tests/unit/test_finder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ def test_process_project_url(data):
485485

486486
assert len(actual) == 1
487487
package_link = actual[0]
488-
assert package_link.project == 'simple'
488+
assert package_link.name == 'simple'
489489
assert str(package_link.version) == '1.0'
490490

491491

tests/unit/test_models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_sets_correct_variables(self):
4747
obj = candidate.InstallationCandidate(
4848
"A", "1.0.0", "https://somewhere.com/path/A-1.0.0.tar.gz"
4949
)
50-
assert obj.project == "A"
50+
assert obj.name == "A"
5151
assert obj.version == parse_version("1.0.0")
5252
assert obj.link == "https://somewhere.com/path/A-1.0.0.tar.gz"
5353

@@ -57,4 +57,4 @@ def test_sets_the_right_key(self):
5757
obj = candidate.InstallationCandidate(
5858
"A", "1.0.0", "https://somewhere.com/path/A-1.0.0.tar.gz"
5959
)
60-
assert obj._compare_key == (obj.project, obj.version, obj.link)
60+
assert obj._compare_key == (obj.name, obj.version, obj.link)

0 commit comments

Comments
 (0)