Commit a074b625 authored by Jason R. Coombs's avatar Jason R. Coombs

Update EGG_NAME regular expression matcher to allow names to include dashes....

Update EGG_NAME regular expression matcher to allow names to include dashes. Fixes failing test and fixes #307.
parent a54a7643
...@@ -2267,8 +2267,8 @@ OBRACKET = re.compile(r"\s*\[").match ...@@ -2267,8 +2267,8 @@ OBRACKET = re.compile(r"\s*\[").match
CBRACKET = re.compile(r"\s*\]").match CBRACKET = re.compile(r"\s*\]").match
MODULE = re.compile(r"\w+(\.\w+)*$").match MODULE = re.compile(r"\w+(\.\w+)*$").match
EGG_NAME = re.compile( EGG_NAME = re.compile(
r"(?P<name>[^-]+)" r"(?P<name>.*?)"
r"( -(?P<ver>[^-]+) (-py(?P<pyver>[^-]+) (-(?P<plat>.+))? )? )?", r"( -(?P<ver>[^-]+) (-py(?P<pyver>[^-]+) (-(?P<plat>.+))? )? )?$",
re.VERBOSE | re.IGNORECASE re.VERBOSE | re.IGNORECASE
).match ).match
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment