From 4f52bace9b503744655dd418ab670fa72e5c9b6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
Date: Mon, 27 Jun 2022 08:49:24 +0200
Subject: [PATCH] Normalize extra values in markers

---
 packaging/markers.py | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/packaging/markers.py b/packaging/markers.py
index 2bb7de360..ddb0ac17d 100644
--- a/packaging/markers.py
+++ b/packaging/markers.py
@@ -8,7 +8,7 @@
 import sys
 from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
-from ._parser import MarkerAtom, MarkerList, Op, Variable, parse_marker_expr
+from ._parser import MarkerAtom, MarkerList, Op, Value, Variable, parse_marker_expr
 from ._tokenizer import ParseExceptionError, Tokenizer
 from .specifiers import InvalidSpecifier, Specifier
 from .utils import canonicalize_name
@@ -43,6 +43,22 @@ class UndefinedEnvironmentName(ValueError):
     """
 
 
+def _normalize_extra_values(results: Any) -> Any:
+    """
+    Normalize extra values.
+    """
+    if isinstance(results[0], tuple):
+        lhs, op, rhs = results[0]
+        if isinstance(lhs, Variable) and lhs.value == "extra":
+            normalized_extra = canonicalize_name(rhs.value)
+            rhs = Value(normalized_extra)
+        elif isinstance(rhs, Variable) and rhs.value == "extra":
+            normalized_extra = canonicalize_name(lhs.value)
+            lhs = Value(normalized_extra)
+        results[0] = lhs, op, rhs
+    return results
+
+
 def _format_marker(
     marker: Union[List[str], MarkerAtom, str], first: Optional[bool] = True
 ) -> str:
@@ -170,7 +186,9 @@ def default_environment() -> Dict[str, str]:
 class Marker:
     def __init__(self, marker: str) -> None:
         try:
-            self._markers = parse_marker_expr(Tokenizer(marker))
+            self._markers = _normalize_extra_values(
+                parse_marker_expr(Tokenizer(marker))
+            )
             # The attribute `_markers` can be described in terms of a recursive type:
             # MarkerList = List[Union[Tuple[Node, ...], str, MarkerList]]
             #