From 33f3243c8256742112bec48d1f34c61ddbfb95be Mon Sep 17 00:00:00 2001 From: Anderson Bravalheri Date: Tue, 24 Jan 2023 10:35:45 +0000 Subject: Fix dist-info naming discrepancy in relation to bdist_wheel --- setuptools/command/dist_info.py | 4 ++-- setuptools/command/egg_info.py | 10 +++------- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'setuptools/command') diff --git a/setuptools/command/dist_info.py b/setuptools/command/dist_info.py index d5344471..71acdc18 100644 --- a/setuptools/command/dist_info.py +++ b/setuptools/command/dist_info.py @@ -70,8 +70,8 @@ class dist_info(Command): egg_info.finalize_options() self.egg_info = egg_info - name = _normalization.safe_name(dist.get_name()).replace(".", "_") - version = _normalization.best_effort_version(dist.get_version()) + name = _normalization.safer_name(dist.get_name()) + version = _normalization.safer_best_effort_version(dist.get_version()) self.name = f"{name}-{version}" self.dist_info_dir = os.path.join(self.output_dir, f"{self.name}.dist-info") diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 2314b448..30ecf1dd 100644 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -234,7 +234,7 @@ class egg_info(InfoCommon, Command): self.egg_base = (dirs or {}).get('', os.curdir) self.ensure_dirname('egg_base') - self.egg_info = _filename_component(self.egg_name) + '.egg-info' + self.egg_info = _normalization.filename_component(self.egg_name) + '.egg-info' if self.egg_base != os.curdir: self.egg_info = os.path.join(self.egg_base, self.egg_info) if '-' in self.egg_name: @@ -778,17 +778,13 @@ def get_pkg_info_revision(): def _egg_basename(egg_name, egg_version, py_version=PY_MAJOR, platform=None): """Compute filename of the output egg. Private API.""" - name = _filename_component(egg_name) - version = _filename_component(egg_version) + name = _normalization.filename_component(egg_name) + version = _normalization.filename_component(egg_version) egg = f"{name}-{version}-py{py_version}" if platform: egg += f"-{platform}" return egg -def _filename_component(value): - return value.replace("-", "_") - - class EggInfoDeprecationWarning(SetuptoolsDeprecationWarning): """Deprecated behavior warning for EggInfo, bypassing suppression.""" -- cgit v1.2.1