From 50f3efcd6651b443a35a05c59013dcced465df12 Mon Sep 17 00:00:00 2001 From: MolarFox Date: Wed, 15 Mar 2023 02:22:17 +1100 Subject: [PATCH 1/3] Add specific error message when project name contains disallowed chars --- src/poetry/core/masonry/utils/module.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/poetry/core/masonry/utils/module.py b/src/poetry/core/masonry/utils/module.py index c97aefda6..2fc2cd5de 100644 --- a/src/poetry/core/masonry/utils/module.py +++ b/src/poetry/core/masonry/utils/module.py @@ -66,9 +66,9 @@ def __init__( } ] else: - raise ModuleOrPackageNotFound( - f"No file/folder found for package {name}" - ) + if self._name != name: + raise ModuleOrPackageNotFound(f"Project file/folder contains disallowed characters - expected naming: {name}") + raise ModuleOrPackageNotFound(f"No file/folder found for package {name}") for package in packages: formats = package.get("format") From 718324afe3f271fe4e2757dfcf336e754271309a Mon Sep 17 00:00:00 2001 From: MolarFox Date: Wed, 15 Mar 2023 02:23:04 +1100 Subject: [PATCH 2/3] Lowercase raw projectname val before comparison --- src/poetry/core/masonry/utils/module.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/poetry/core/masonry/utils/module.py b/src/poetry/core/masonry/utils/module.py index 2fc2cd5de..7e490e13a 100644 --- a/src/poetry/core/masonry/utils/module.py +++ b/src/poetry/core/masonry/utils/module.py @@ -66,7 +66,7 @@ def __init__( } ] else: - if self._name != name: + if self._name != name.lower(): raise ModuleOrPackageNotFound(f"Project file/folder contains disallowed characters - expected naming: {name}") raise ModuleOrPackageNotFound(f"No file/folder found for package {name}") From 5ec1bc4002de8535c7795cf8a92f93e9fc8b792a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 14 Mar 2023 16:12:40 +0000 Subject: [PATCH 3/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/poetry/core/masonry/utils/module.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/poetry/core/masonry/utils/module.py b/src/poetry/core/masonry/utils/module.py index 7e490e13a..85c8788a4 100644 --- a/src/poetry/core/masonry/utils/module.py +++ b/src/poetry/core/masonry/utils/module.py @@ -67,8 +67,13 @@ def __init__( ] else: if self._name != name.lower(): - raise ModuleOrPackageNotFound(f"Project file/folder contains disallowed characters - expected naming: {name}") - raise ModuleOrPackageNotFound(f"No file/folder found for package {name}") + raise ModuleOrPackageNotFound( + "Project file/folder contains disallowed characters -" + f" expected naming: {name}" + ) + raise ModuleOrPackageNotFound( + f"No file/folder found for package {name}" + ) for package in packages: formats = package.get("format")