Made wheel file name parsing more permissive

Fixes #265.
pypa · Oct 6, 2018 · c84867f · KOLANICH · Oct 15, 2018 · agronholm
1 parent 826dff4
commit c84867f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/docs/news.rst b/docs/news.rst
@@ -4,6 +4,7 @@ Release Notes
 **UNRELEASED**
 
 - Fixed build number appearing in the ``.dist-info`` directory name
+- Made wheel file name parsing more permissive
 
 **0.32.1**
 

diff --git a/wheel/wheelfile.py b/wheel/wheelfile.py
@@ -14,8 +14,8 @@
 # Non-greedy matching of an optional build number may be too clever (more
 # invalid wheel filenames will match). Separate regex for .dist-info?
 WHEEL_INFO_RE = re.compile(
-    r"""^(?P<namever>(?P<name>.+?)-(?P<ver>\d.*?))(-(?P<build>\d.*?))?
-     -(?P<pyver>[a-z].+?)-(?P<abi>.+?)-(?P<plat>.+?)(\.whl|\.dist-info)$""",
+    r"""^(?P<namever>(?P<name>[\w\d.]+)-(?P<ver>[\w\d.]+))(-(?P<build>\d[\w\d.]*))?
+     -(?P<pyver>[\w\d.]+)-(?P<abi>[\w\d.]+)-(?P<plat>[\w\d.]+)\.whl$""",
     re.VERBOSE)