vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: Use raw string to avoid invalid sequence errors

Browse source 
Escaped when proven easier
This commit is contained in:
Gavin D'souza 2021-05-26 19:30:08 +05:30
parent 131cfaee8b
commit f6b215938a
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/translate.py
View file

@ -589,7 +589,7 @@ def is_translatable(m):
def add_line_number(messages, code):
ret = []
messages = sorted(messages, key=lambda x: x[0])
newlines = [m.start() for m in re.compile('\\n').finditer(code)]
newlines = [m.start() for m in re.compile(r'\n').finditer(code)]
line = 1
newline_i = 0
for pos, message, context in messages:

2
frappe/utils/__init__.py
View file

@ -151,7 +151,7 @@ def split_emails(txt):
# emails can be separated by comma or newline
s = re.sub(r'[\t\n\r]', ' ', cstr(txt))
for email in re.split('''[,\\n](?=(?:[^"]|"[^"]*")*$)''', s):
for email in re.split(r'[,\n](?=(?:[^"]|"[^"]*")*$)', s):
email = strip(cstr(email))
if email:
email_list.append(email)

8
frappe/utils/data.py
View file

@ -454,7 +454,7 @@ def duration_to_seconds(duration):
def validate_duration_format(duration):
import re
is_valid_duration = re.match("^(?:(\d+d)?((^|\s)\d+h)?((^|\s)\d+m)?((^|\s)\d+s)?)$", duration)
is_valid_duration = re.match(r"^(?:(\d+d)?((^|\s)\d+h)?((^|\s)\d+m)?((^|\s)\d+s)?)$", duration)
if not is_valid_duration:
frappe.throw(frappe._("Value {0} must be in the valid duration format: d h m s").format(frappe.bold(duration)))
@ -1341,10 +1341,10 @@ def expand_relative_urls(html):
return "".join(to_expand)
html = re.sub('(href|src){1}([\s]*=[\s]*[\'"]?)((?!http)[^\'" >]+)([\'"]?)', _expand_relative_urls, html)
html = re.sub(r'(href|src){1}([\s]*=[\s]*[\'"]?)((?!http)[^\'" >]+)([\'"]?)', _expand_relative_urls, html)
# background-image: url('/assets/...')
html = re.sub('(:[\s]?url)(\([\'"]?)((?!http)[^\'" >]+)([\'"]?\))', _expand_relative_urls, html)
html = re.sub(r'(:[\s]?url)(\([\'"]?)((?!http)[^\'" >]+)([\'"]?\))', _expand_relative_urls, html)
return html
def quoted(url):
@ -1355,7 +1355,7 @@ def quote_urls(html):
groups = list(match.groups())
groups[2] = quoted(groups[2])
return "".join(groups)
return re.sub('(href|src){1}([\s]*=[\s]*[\'"]?)((?:http)[^\'">]+)([\'"]?)',
return re.sub(r'(href|src){1}([\s]*=[\s]*[\'"]?)((?:http)[^\'">]+)([\'"]?)',
_quote_url, html)
def unique(seq):