altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Changed regex strings to r strings.

Browse source 
- Legacy-Id: 16320
This commit is contained in:
Henrik Levkowetz 2019-06-28 13:32:50 +00:00
parent bafcc55d05
commit 318bd0d5ea
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ietf/meeting/views.py
View file

@ -171,11 +171,11 @@ def current_materials(request):
def materials_document(request, document, num=None, ext=None):
if num is None:
num = get_meeting(num).number
if (re.search('^\w+-\d+-.+-\d\d$', document) or
re.search('^\w+-interim-\d+-.+-\d\d-\d\d$', document) or
re.search('^\w+-interim-\d+-.+-sess[a-z]-\d\d$', document) or
re.search('^minutes-interim-\d+-.+-\d\d$', document) or
re.search('^slides-interim-\d+-.+-\d\d$', document)):
if (re.search(r'^\w+-\d+-.+-\d\d$', document) or
re.search(r'^\w+-interim-\d+-.+-\d\d-\d\d$', document) or
re.search(r'^\w+-interim-\d+-.+-sess[a-z]-\d\d$', document) or
re.search(r'^minutes-interim-\d+-.+-\d\d$', document) or
re.search(r'^slides-interim-\d+-.+-\d\d$', document)):
name, rev = document.rsplit('-', 1)
else:
name, rev = document, None

4
ietf/utils/text.py
View file

@ -23,8 +23,8 @@ def xslugify(value):
(I.e., does the same as slugify, but also converts slashes to dashes.)
"""
value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore').decode('ascii')
value = re.sub('[^\w\s/-]', '', value).strip().lower()
return mark_safe(re.sub('[-\s/]+', '-', value))
value = re.sub(r'[^\w\s/-]', '', value).strip().lower()
return mark_safe(re.sub(r'[-\s/]+', '-', value))
def strip_prefix(text, prefix):
if text.startswith(prefix):