Skip to content

Commit 1cde125

Browse files
committed
Rename InstallationCandidate.{project -> name}
1 parent d38cead commit 1cde125

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

src/pip/_internal/index/package_finder.py

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

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

src/pip/_internal/models/candidate.py

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,33 @@
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

24+
self.already_installed = False
25+
self.editable = False
26+
2527
super(InstallationCandidate, self).__init__(
26-
key=(self.project, self.version, self.link),
28+
key=(self.name, self.version, self.link),
2729
defining_class=InstallationCandidate
2830
)
2931

3032
def __repr__(self):
3133
# type: () -> str
3234
return "<InstallationCandidate({!r}, {!r}, {!r})>".format(
33-
self.project, self.version, self.link,
35+
self.name, self.version, self.link,
3436
)
3537

3638
def __str__(self):
3739
return '{!r} candidate (version {} at {})'.format(
38-
self.project, self.version, self.link,
40+
self.name, self.version, self.link,
3941
)

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)