Mercurial > piecrust2
changeset 1168:10520472cc73
routing: Fix breakages with routing on some versions of Python.
Finally figured what happened with change 6baa94da8b16 (this is a Mercurial
hash by the way if you're looking at the Git mirror). Between Python 3.6 and
3.7 there was a change where the percent sign ('%') went from being escaped by
`re.escape` to _not_ being escaped. So now we need to use different regex
patterns dependin on the Python version, yay.
| author | Ludovic Chabant <ludovic@chabant.com> |
|---|---|
| date | Fri, 04 Oct 2019 11:13:33 -0700 |
| parents | c0c00dc1eac7 |
| children | 978ed6deea91 |
| files | piecrust/appconfig.py piecrust/routing.py |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/piecrust/appconfig.py Fri Oct 04 10:07:38 2019 -0700 +++ b/piecrust/appconfig.py Fri Oct 04 11:13:33 2019 -0700 @@ -1,5 +1,6 @@ import re import os.path +import sys import copy import json import urllib @@ -372,7 +373,8 @@ cache.write('pagination_suffix_format', pgn_suffix_fmt) pgn_suffix_re = re.escape(v) - pgn_suffix_re = (pgn_suffix_re.replace("\\%num\\%", "(?P<num>\\d+)") + + escaped_token = "%num%" if sys.hexversion >= 0x3070000 else "\\%num\\%" + pgn_suffix_re = (pgn_suffix_re.replace(escaped_token, "(?P<num>\\d+)") + '$') cache.write('pagination_suffix_re', pgn_suffix_re) return v
--- a/piecrust/routing.py Fri Oct 04 10:07:38 2019 -0700 +++ b/piecrust/routing.py Fri Oct 04 11:13:33 2019 -0700 @@ -1,5 +1,6 @@ import re import os.path +import sys import copy import logging import urllib.parse @@ -10,8 +11,13 @@ route_re = re.compile(r'%((?P<qual>[\w\d]+):)?(?P<var>\+)?(?P<name>\w+)%') -route_esc_re = re.compile( - r'%((?P<qual>[\w\d]+)\\:)?(?P<var>\\\+)?(?P<name>\w+)%') +if sys.hexversion >= 0x3070000: + route_esc_re = re.compile( + r'%((?P<qual>[\w\d]+)\\:)?(?P<var>\\\+)?(?P<name>\w+)%') +else: + route_esc_re = re.compile( + r'\\%((?P<qual>[\w\d]+)\\:)?(?P<var>\\\+)?(?P<name>\w+)\\%') + ugly_url_cleaner = re.compile(r'\.html$')