[PATCH 1/3] Mark regexes with 'r' prefixes
Stephen Finucane
stephenfinucane at hotmail.com
Thu Sep 8 07:03:47 AEST 2016
Resolves landscape.io errors.
Signed-off-by: Stephen Finucane <stephenfinucane at hotmail.com>
---
patchwork/parser.py | 4 ++--
patchwork/templatetags/syntax.py | 24 ++++++++++++------------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/patchwork/parser.py b/patchwork/parser.py
index 1805df8..3389e96 100644
--- a/patchwork/parser.py
+++ b/patchwork/parser.py
@@ -463,7 +463,7 @@ def parse_patch(content):
patchbuf += buf + line
buf = ''
state = 2
- elif hunk and line.startswith('\ No newline at end of file'):
+ elif hunk and line.startswith(r'\ No newline at end of file'):
# If we had a hunk and now we see this, it's part of the patch,
# and we're still expecting another @@ line.
patchbuf += line
@@ -479,7 +479,7 @@ def parse_patch(content):
lc[0] -= 1
elif line.startswith('+'):
lc[1] -= 1
- elif line.startswith('\ No newline at end of file'):
+ elif line.startswith(r'\ No newline at end of file'):
# Special case: Not included as part of the hunk's line count
pass
else:
diff --git a/patchwork/templatetags/syntax.py b/patchwork/templatetags/syntax.py
index 6cb8ff8..653caf4 100644
--- a/patchwork/templatetags/syntax.py
+++ b/patchwork/templatetags/syntax.py
@@ -35,23 +35,23 @@ def _compile(t):
return (re.compile(r, re.M | re.I), str)
_patch_span_res = list(map(_compile, [
- ('^(Index:?|diff|\-\-\-|\+\+\+|\*\*\*) .*$', 'p_header'),
- ('^\+.*$', 'p_add'),
- ('^-.*$', 'p_del'),
- ('^!.*$', 'p_mod'),
+ (r'^(Index:?|diff|\-\-\-|\+\+\+|\*\*\*) .*$', 'p_header'),
+ (r'^\+.*$', 'p_add'),
+ (r'^-.*$', 'p_del'),
+ (r'^!.*$', 'p_mod'),
]))
_patch_chunk_re = \
- re.compile('^(@@ \-\d+(?:,\d+)? \+\d+(?:,\d+)? @@)(.*)$', re.M | re.I)
+ re.compile(r'^(@@ \-\d+(?:,\d+)? \+\d+(?:,\d+)? @@)(.*)$', re.M | re.I)
_comment_span_res = list(map(_compile, [
- ('^\s*Signed-off-by: .*$', 'signed-off-by'),
- ('^\s*Acked-by: .*$', 'acked-by'),
- ('^\s*Nacked-by: .*$', 'nacked-by'),
- ('^\s*Tested-by: .*$', 'tested-by'),
- ('^\s*Reviewed-by: .*$', 'reviewed-by'),
- ('^\s*From: .*$', 'from'),
- ('^\s*>.*$', 'quote'),
+ (r'^\s*Signed-off-by: .*$', 'signed-off-by'),
+ (r'^\s*Acked-by: .*$', 'acked-by'),
+ (r'^\s*Nacked-by: .*$', 'nacked-by'),
+ (r'^\s*Tested-by: .*$', 'tested-by'),
+ (r'^\s*Reviewed-by: .*$', 'reviewed-by'),
+ (r'^\s*From: .*$', 'from'),
+ (r'^\s*>.*$', 'quote'),
]))
_span = '<span class="%s">%s</span>'
--
2.7.4
More information about the Patchwork
mailing list