From 23612d48a359269043766523b7411aee52d5f4b3 Mon Sep 17 00:00:00 2001
From: Arun Babu Neelicattu <arun.neelicattu@gmail.com>
Date: Fri, 22 Mar 2024 23:38:55 +0100
Subject: [PATCH] inspection/info: correctly raise PackageInfoError

Previously, when processing wheel files, PackageInfo incorrectly
returned an empty instance. This change ensures a PackageInfoError
is correctly raised.
---
 src/poetry/inspection/info.py              |  4 +--
 tests/repositories/test_http_repository.py | 30 +++++++++++++++++-----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/poetry/inspection/info.py b/src/poetry/inspection/info.py
index a088fd9c0db..e0e4884f868 100644
--- a/src/poetry/inspection/info.py
+++ b/src/poetry/inspection/info.py
@@ -545,8 +545,8 @@ def from_wheel(cls, path: Path) -> PackageInfo:
         try:
             wheel = pkginfo.Wheel(str(path))
             return cls._from_distribution(wheel)
-        except ValueError:
-            return PackageInfo()
+        except ValueError as e:
+            raise PackageInfoError(path, e)
 
     @classmethod
     def from_bdist(cls, path: Path) -> PackageInfo:
diff --git a/tests/repositories/test_http_repository.py b/tests/repositories/test_http_repository.py
index 263da397491..6d7fd667b02 100644
--- a/tests/repositories/test_http_repository.py
+++ b/tests/repositories/test_http_repository.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import contextlib
 import shutil
 
 from pathlib import Path
@@ -12,6 +13,7 @@
 from packaging.metadata import parse_email
 from poetry.core.packages.utils.link import Link
 
+from poetry.inspection.info import PackageInfoError
 from poetry.inspection.lazy_wheel import HTTPRangeRequestUnsupported
 from poetry.repositories.http_repository import HTTPRepository
 from poetry.utils.helpers import HTTPRangeRequestSupported
@@ -116,13 +118,18 @@ def test_get_info_from_wheel_state_sequence(mocker: MockerFixture) -> None:
 
     # 1. range request and download
     mock_metadata_from_wheel_url.side_effect = HTTPRangeRequestUnsupported
-    repo._get_info_from_wheel(link)
+
+    with contextlib.suppress(PackageInfoError):
+        repo._get_info_from_wheel(link)
+
     assert mock_metadata_from_wheel_url.call_count == 1
     assert mock_download.call_count == 1
     assert mock_download.call_args[1]["raise_accepts_ranges"] is False
 
     # 2. only download
-    repo._get_info_from_wheel(link)
+    with contextlib.suppress(PackageInfoError):
+        repo._get_info_from_wheel(link)
+
     assert mock_metadata_from_wheel_url.call_count == 1
     assert mock_download.call_count == 2
     assert mock_download.call_args[1]["raise_accepts_ranges"] is True
@@ -130,27 +137,38 @@ def test_get_info_from_wheel_state_sequence(mocker: MockerFixture) -> None:
     # 3. download and range request
     mock_metadata_from_wheel_url.side_effect = None
     mock_download.side_effect = HTTPRangeRequestSupported
-    repo._get_info_from_wheel(link)
+
+    with contextlib.suppress(PackageInfoError):
+        repo._get_info_from_wheel(link)
+
     assert mock_metadata_from_wheel_url.call_count == 2
     assert mock_download.call_count == 3
     assert mock_download.call_args[1]["raise_accepts_ranges"] is True
 
     # 4. only range request
-    repo._get_info_from_wheel(link)
+    with contextlib.suppress(PackageInfoError):
+        repo._get_info_from_wheel(link)
+
     assert mock_metadata_from_wheel_url.call_count == 3
     assert mock_download.call_count == 3
 
     # 5. range request and download
     mock_metadata_from_wheel_url.side_effect = HTTPRangeRequestUnsupported
     mock_download.side_effect = None
-    repo._get_info_from_wheel(link)
+
+    with contextlib.suppress(PackageInfoError):
+        repo._get_info_from_wheel(link)
+
     assert mock_metadata_from_wheel_url.call_count == 4
     assert mock_download.call_count == 4
     assert mock_download.call_args[1]["raise_accepts_ranges"] is False
 
     # 6. only range request
     mock_metadata_from_wheel_url.side_effect = None
-    repo._get_info_from_wheel(link)
+
+    with contextlib.suppress(PackageInfoError):
+        repo._get_info_from_wheel(link)
+
     assert mock_metadata_from_wheel_url.call_count == 5
     assert mock_download.call_count == 4