Use Requirement.parse to populate extra reqs

python/pip_install/extract_wheels/lib/requirements.py

@@ -1,4 +1,3 @@
-import re
 from typing import Dict, Optional, Set, Tuple
 
 import pkg_resources
@@ -31,17 +30,7 @@ def _parse_requirement_for_extra(
     """Given a requirement string, returns the requirement name and set of extras, if extras specified.
     Else, returns (None, None)
     """
-
-    # https://www.python.org/dev/peps/pep-0508/#grammar
-    extras_pattern = re.compile(
-        r"^\s*([0-9A-Za-z][0-9A-Za-z_.\-]*)\s*\[\s*([0-9A-Za-z][0-9A-Za-z_.\-]*(?:\s*,\s*[0-9A-Za-z][0-9A-Za-z_.\-]*)*)\s*\]"
-    )
-
-    matches = extras_pattern.match(requirement)
-    if matches:
-        return (
-            pkg_resources.Requirement.parse(matches.group(1)).key,
-            {extra.strip() for extra in matches.group(2).split(",")},
-        )
-
+    req = pkg_resources.Requirement.parse(requirement)
+    if req.extras:
+        return (req.key, set(req.extras))
     return None, None

python/pip_install/extract_wheels/lib/requirements_test.py

@@ -7,8 +7,10 @@ class TestRequirementExtrasParsing(unittest.TestCase):
     def test_parses_requirement_for_extra(self) -> None:
         cases = [
             ("name[foo]", ("name", frozenset(["foo"]))),
-            ("name[ Foo123 ]", ("name", frozenset(["Foo123"]))),
+            ("name[ Foo123 ]", ("name", frozenset(["foo123"]))),
             (" name1[ foo ] ", ("name1", frozenset(["foo"]))),
+            ("Name[foo]", ("name", frozenset(["foo"]))),
+            ("Name_Foo[bar]", ("name-foo", frozenset(["bar"]))),
             (
                 "name [fred,bar] @ http://foo.com ; python_version=='2.7'",
                 ("name", frozenset(["fred", "bar"])),