diff options
| -rw-r--r-- | CHANGELOG.rst | 2 | ||||
| -rw-r--r-- | routes/route.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index dc2aa4a..9fc398b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,8 @@ Routes Changelog Release 2.1 (**dev**) ===================== +* Fix 3 other route matching groups in route.py to use anonymous groups for + optional sections to avoid exceeding regex limits. Fixes #15. * Printing a mapper now includes the Controller/action parameters from the route. Fixes #11. * Fix regression that didn't allow passing in params 'host', 'protocol', or diff --git a/routes/route.py b/routes/route.py index ea14b1f..901b4f6 100644 --- a/routes/route.py +++ b/routes/route.py @@ -424,7 +424,7 @@ class Route(object): # our regexp first. It's still possible we could be completely # blank as we have a default if var in self.reqs and var in self.defaults: - reg = '(' + partreg + rest + ')?' + reg = '(?:' + partreg + rest + ')?' # Or we have a regexp match with no default, so now being # completely blank form here on out isn't possible @@ -454,7 +454,7 @@ class Route(object): # something else in the chain does have req's though, we have # to make the partreg here required to continue matching if allblank and var in self.defaults: - reg = '(' + partreg + rest + ')?' + reg = '(?:' + partreg + rest + ')?' # Same as before, but they can't all be blank, so we have to # require it all to ensure our matches line up right @@ -490,7 +490,7 @@ class Route(object): noreqs = False elif part and part[-1] in self.done_chars: if allblank: - reg = re.escape(part[:-1]) + '(' + re.escape(part[-1]) + rest + reg = re.escape(part[:-1]) + '(?:' + re.escape(part[-1]) + rest reg += ')?' else: allblank = False |