diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-02 18:52:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-02 18:52:32 +0000 |
| commit | 620f768000a3cc6e629cb86e484fc513ee6e35d2 (patch) | |
| tree | b860902f545c665b13b2dc43319010581587409e /keystonemiddleware | |
| parent | 62c3eaf0939306b1ff17f0a045b42f86a3db5d8c (diff) | |
| parent | 4d6e9cb16228e21c551e0d894c45f2a137688cca (diff) | |
| download | keystonemiddleware-620f768000a3cc6e629cb86e484fc513ee6e35d2.tar.gz | |
Merge "Fix DeprecationWarning: invalid escape sequence issues"
Diffstat (limited to 'keystonemiddleware')
| -rw-r--r-- | keystonemiddleware/auth_token/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py index b29b63a..d961f59 100644 --- a/keystonemiddleware/auth_token/__init__.py +++ b/keystonemiddleware/auth_token/__init__.py @@ -282,14 +282,14 @@ def _path_matches(request_path, path_pattern): # The fnmatch module doesn't provide the ability to match * versus **, # so convert to regex. token_regex = (r'(?P<tag>{[^}]*})|' # {tag} # nosec - '(?P<wild>\*(?=$|[^\*]))|' # * - '(?P<rec_wild>\*\*)|' # ** - '(?P<literal>[^{}\*])') # anything else + r'(?P<wild>\*(?=$|[^\*]))|' # * + r'(?P<rec_wild>\*\*)|' # ** + r'(?P<literal>[^{}\*])') # anything else path_regex = '' for match in re.finditer(token_regex, path_pattern): token = match.groupdict() if token['tag'] or token['wild']: - path_regex += '[^\/]+' + path_regex += r'[^\/]+' if token['rec_wild']: path_regex += '.*' if token['literal']: |