Skip to content

Commit 9f764e8

Browse files
committed
Consolidate safe_name/safer_name logic
1 parent 1836bfb commit 9f764e8

File tree

1 file changed

+1
-17
lines changed

1 file changed

+1
-17
lines changed

setuptools/command/bdist_wheel.py

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,13 @@
2323
from wheel.wheelfile import WheelFile
2424

2525
from .. import Command, __version__, _shutil
26+
from .._normalization import safer_name
2627
from ..warnings import SetuptoolsDeprecationWarning
2728
from .egg_info import egg_info as egg_info_cls
2829

2930
from distutils import log
3031

3132

32-
def safe_name(name: str) -> str:
33-
"""Convert an arbitrary string to a standard distribution name
34-
Any runs of non-alphanumeric/. characters are replaced with a single '-'.
35-
"""
36-
return re.sub("[^A-Za-z0-9.]+", "-", name)
37-
38-
3933
def safe_version(version: str) -> str:
4034
"""
4135
Convert an arbitrary string to a standard version string
@@ -133,16 +127,6 @@ def get_abi_tag() -> str | None:
133127
return abi
134128

135129

136-
def safer_name(name: str) -> str:
137-
return (
138-
# Per https://packaging.python.org/en/latest/specifications/name-normalization/#name-normalization
139-
re.sub(r"[-_.]+", "-", safe_name(name))
140-
.lower()
141-
# Per https://packaging.python.org/en/latest/specifications/binary-distribution-format/#escaping-and-unicode
142-
.replace("-", "_")
143-
)
144-
145-
146130
def safer_version(version: str) -> str:
147131
return safe_version(version).replace("-", "_")
148132

0 commit comments

Comments
 (0)