Proposal: add re.fullmatch() method #60407
Comments
|
I've noticed a subtle bug in some of our internal code. Someone wants to ensure that a certain string (e.g. a URL path) matches a certain pattern in its entirety. They use re.match() with a regex ending in $. Fine. Now someone else comes along and modifies the pattern. Somehow the $ gets lost, or the pattern develops a set of toplevel choices that don't all end in $. And now things that have a valid *prefix* suddenly (and unintentionally) start matching. I think this is a common enough issue and propose a new API: a fullmatch() function and method that work just like the existing match() function and method but also check that the whole input string matches. This can be implemented slightly awkwardly as follows in user code: def fullmatch(regex, input, flags=0):
m = re.match(regex, input, flags)
if m is not None and m.end() == len(input):
return m
return None(The corresponding method will have to be somewhat more complex because the underlying match() method takes optional pos and endpos arguments.) |
|
+1. Note that this really can't be done in user-level code. For example, consider matching the pattern a|ab against the string ab Without being _forced_ to consider the "ab" branch, the regexp will match just the "a" branch. So, e.g., the example code you posted will say "nope, it didn't match (the whole thing)". |
|
What will be with non-greedy qualifiers? Should '.*?' full match any string? >>> re.match('.*?$', 'abc').group()
'abc'
>>> re.match('.*?', 'abc').group()
'' |
Well, how about: def fullmatch(regex, input, flags=0):
return re.match("(:?" + regex + ")$", input, flags) |
|
Antoine, that's certainly the conceptual intent here. Can't say whether your attempt works in all cases. The docs don't guarantee it. For example, if the original regexp started with (?x), the docs explicitly say the effect of (?x) is undefined "if there are non-whitespace characters before the [inline (?x)] flag". Sure, you could parse the regexp is user code too, and move an initial (?...x...) before your non-capturing group. For that matter, you could write your own regexp engine in user code too ;-) The point is that it should be easy for the regexp engine to implement the desired functionality - and user attempts to "fake it" have pitfalls (even Guido didn't get it right - LOL ;-) ). |
|
'$' will match at the end of the string or just before the final '\n': >>> re.match(r'abc$', 'abc\n')
<_sre.SRE_Match object at 0x00F15448>So shouldn't you be using r'\Z' instead? >>> re.match(r'abc\Z', 'abc')
<_sre.SRE_Match object at 0x00F15410>
>>> re.match(r'abc\Z', 'abc\n')
>>> And what happens if the MULTILINE flag is turned on? >>> re.match(r'abc$', 'abc\ndef', flags=re.MULTILINE)
<_sre.SRE_Match object at 0x00F15448>
>>> re.match(r'abc\Z', 'abc\ndef', flags=re.MULTILINE)
>>> |
|
Matthew, Guido wrote "check that the whole input string matches" (or slice if pos and (possibly also) endpos is/are given). So, yes, \Z is more to the point than $ if people want to continue wasting time trying to implement this as a Python-level function ;-) I don't understand what you're asking about MULTILINE. What's the issue there? Focus on Guido's "whole input string matches", not on his motivational talk about "a regex ending in $". $ and/or \Z aren't the point here; "whole input string matches" is the point. |
|
Tim, my point is that if the MULTILINE flag happens to be turned on, '$' won't just match at the end of the string (or slice), it'll also match at a newline, so wrapping the pattern in (?:...)$ in that case could give the wrong answer, but wrapping it in (?:...)\Z would give the right answer. |
This means Tim and Guido are right that a dedicated fullmatch() method |
|
Definitely this is not easy issue. |
|
Serhiy, I expect this is easy to implement _inside_ the regexp engine. The complications come from trying to do it outside the engine. But even there, wrapping the original regexp <re> in (?:<re>)\Z is at worst very close. The only insecurity with that I've thought of concerns the doc's warnings about what can appear before an inline re.VERBOSE flag. It probably works fine even if <re> does begin with (?...x....). |
|
It certainly appears to ignore the whitespace, even if the "(?x)" is at the end of the pattern or in the middle of a group. Another point we need to consider is that the user might want to use a pre-compiled pattern. |
|
I'm about to add this to my regex implementation and, naturally, I want it to have the same name for compatibility. However, I'm not that keen on "fullmatch" and would prefer "matchall" instead. What do you think? |
|
I like "matchall" fine, but I can't channel Guido on names - he sometimes gets those wrong ;-) |
|
re.matchall() would appear to be related to re.findall(), which it isn't. The re2 package has a FullMatch method: |
|
re2's FullMatch method contrasts with its PartialMatch method, which re doesn't have! |
|
But my other argument stands. |
|
OK, in order to avoid bikeshedding, "fullmatch" it is. |
|
FWIW, I prefer "fullmatch" as well :) |
|
Patch attached. I've taken a slightly different approach than what has been discussed here: rather than define a new fullmatch() function and method, I've defined a new re.FULLMATCH flag for match(). So an example would be re.match('abc','abc',re.FULLMATCH)The implementation is basically what has been discussed here, except done when the regular expression is compiled rather than at the user level. |
|
Thanks for the patch. While an internal flag may be a reasonable implementation strategy, IMHO a dedicated method still makes sense: it's simply more readable than passing a flag. As for the tests, they should probably exercise the interaction with re.MULTILINE - see MRAB's comment in msg172775. |
|
I've attached a patch. |
|
I did not analyze the patch deeply, only left on Rietveld comments on first sight. Need to update the documentation. |
|
The patch doesn't seem to include failure cases for fullmatch (i.e. cases where fullmatch returns None where match or search would return a match). |
|
3 of the tests expect None when using 'fullmatch'; they won't return None when using 'match'. |
Sorry, my bad. Like Serhiy, I can't comment on the changes to re internals, but we can trust you on this. The patch needs documentation, though. |
|
I can't comment right now, but I am going inspect thoroughly re internals. |
|
Serhiy, sorry to ping you, but do you think you're gonna look at this? |
|
I updated the patch to current tip, fixed three issues from the review, and added documentation updates. |
|
New changeset b51218966201 by Georg Brandl in branch 'default': |
|
Sorry, accidental push, already reverted. |
|
Patch updated to current tip. I have added some changes from the review and have added some tests. Matthew, why change for SRE_OP_REPEAT_ONE is needed? Tests are passed without it. |
|
Matthew, could you please answer my question? |
|
I don't know that it's not needed. |
|
New changeset 89dfa2671c83 by Serhiy Storchaka in branch 'default': |
|
Committed with additional test (re.fullmatch('a+', 'ab')) which proves that change for SRE_OP_REPEAT_ONE are needed. Thank you Matthew for your contribution. |
Note: these values reflect the state of the issue at the time it was migrated and might not reflect the current state.
Show more details
GitHub fields:
bugs.python.org fields:
The text was updated successfully, but these errors were encountered: