Skip to content

Commit ed7078e

Browse files
committed
refactor(masonry): indicate that escape_name is for generated wheels only
1 parent 23e40b6 commit ed7078e

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

src/poetry/core/masonry/builders/wheel.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
from poetry.core import __version__
2424
from poetry.core.masonry.builders.builder import Builder
2525
from poetry.core.masonry.builders.sdist import SdistBuilder
26-
from poetry.core.masonry.utils.helpers import escape_name
2726
from poetry.core.masonry.utils.helpers import escape_version
27+
from poetry.core.masonry.utils.helpers import escape_wheel_name
2828
from poetry.core.masonry.utils.helpers import normalize_file_permissions
2929
from poetry.core.masonry.utils.package_include import PackageInclude
3030
from poetry.core.semver.helpers import parse_constraint
@@ -281,7 +281,7 @@ def wheel_data_folder(self) -> str:
281281

282282
@property
283283
def wheel_filename(self) -> str:
284-
name = escape_name(self._package.pretty_name)
284+
name = escape_wheel_name(self._package.pretty_name)
285285
version = escape_version(self._meta.version)
286286
return f"{name}-{version}-{self.tag}.whl"
287287

@@ -291,7 +291,7 @@ def supports_python2(self) -> bool:
291291
)
292292

293293
def dist_info_name(self, distribution: str, version: str) -> str:
294-
escaped_name = escape_name(distribution)
294+
escaped_name = escape_wheel_name(distribution)
295295
escaped_version = escape_version(version)
296296

297297
return f"{escaped_name}-{escaped_version}.dist-info"

src/poetry/core/masonry/utils/helpers.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ def escape_version(version: str) -> str:
2828
return re.sub(r"[^\w\d.+]+", "_", version, flags=re.UNICODE)
2929

3030

31-
def escape_name(name: str) -> str:
32-
"""Escaped wheel name as specified in https://packaging.python.org/en/latest/specifications/binary-distribution-format/#escaping-and-unicode."""
31+
def escape_wheel_name(name: str) -> str:
32+
"""
33+
Escaped wheel name as specified in https://packaging.python.org/en/latest/specifications/binary-distribution-format/#escaping-and-unicode.
34+
This method should only be used for the generation of wheels, and not for the artifact package names.
35+
"""
3336
return re.sub(r"[-_.]+", "_", name, flags=re.UNICODE).lower()

tests/masonry/utils/test_helpers.py

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

33
import pytest
44

5-
from poetry.core.masonry.utils.helpers import escape_name
65
from poetry.core.masonry.utils.helpers import escape_version
6+
from poetry.core.masonry.utils.helpers import escape_wheel_name
77

88

99
@pytest.mark.parametrize(
@@ -33,5 +33,5 @@ def test_escape_version(version: str, expected: str) -> None:
3333
("foo123-ba---.r", "foo123_ba_r"),
3434
],
3535
)
36-
def test_escape_name(name: str, expected: str) -> None:
37-
assert escape_name(name) == expected
36+
def test_escape_wheel_name(name: str, expected: str) -> None:
37+
assert escape_wheel_name(name) == expected

0 commit comments

Comments
 (0)