From c176ef4281eaa21348ec8c1a40483088caf6b451 Mon Sep 17 00:00:00 2001
From: mayeut <mayeut@users.noreply.github.com>
Date: Sat, 18 Jun 2022 12:36:47 +0200
Subject: [PATCH] Normalize specifier version for prefix matching

In case of prefix version matching, normalization of the version was not applied to the specifier's version.
This resulted in `2` being rejected as a candidate for `==0!2.*`
With normalization applied, the candidate is now accepted.
---
 packaging/specifiers.py  | 5 ++++-
 tests/test_specifiers.py | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/packaging/specifiers.py b/packaging/specifiers.py
index 5afafe3f0..ad027ba48 100644
--- a/packaging/specifiers.py
+++ b/packaging/specifiers.py
@@ -386,9 +386,12 @@ def _compare_equal(self, prospective: Version, spec: str) -> bool:
         if spec.endswith(".*"):
             # In the case of prefix matching we want to ignore local segment.
             prospective = Version(prospective.public)
+            # Convert our spec string into a Version ignoring the trailing .*
+            # This allows to get the normalized version string
+            spec_version = Version(spec[:-2])
             # Split the spec out by dots, and pretend that there is an implicit
             # dot in between a release segment and a pre-release segment.
-            split_spec = _version_split(spec[:-2])  # Remove the trailing .*
+            split_spec = _version_split(str(spec_version))
 
             # Split the prospective version out by dots, and pretend that there
             # is an implicit dot in between a release segment and a pre-release
diff --git a/tests/test_specifiers.py b/tests/test_specifiers.py
index 92d04eb0e..ff6471a6f 100644
--- a/tests/test_specifiers.py
+++ b/tests/test_specifiers.py
@@ -302,10 +302,14 @@ def test_comparison_non_specifier(self):
                 ("2c1.post1.dev1", "==2.*"),
                 ("2rc1", "==2.*"),
                 ("2", "==2.*"),
+                ("2", "==0!2.*"),
+                ("0!2", "==2.*"),
                 ("2.0", "==2.*"),
                 ("2.0.0", "==2.*"),
                 ("2.0.post1", "==2.0.post1.*"),
                 ("2.0.post1.dev1", "==2.0.post1.*"),
+                ("2.0.rc1", "==2.0.c1.*"),
+                ("2.0.rc1.post1", "==2.0.c1.*"),
                 ("2.1+local.version", "==2.1.*"),
                 # Test the in-equality operation
                 ("2.1", "!=2"),
@@ -353,6 +357,7 @@ def test_comparison_non_specifier(self):
                 ("1.1", "~=1.0"),
                 ("1.9999999", "~=1.0"),
                 ("1.1", "~=1.0a1"),
+                ("2022.01.01", "~=2022.01.01"),
                 # Test that epochs are handled sanely
                 ("2!1.0", "~=2!1.0"),
                 ("2!1.0", "==2!1.*"),