Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ def lineno(self):
hunkparsed = False # state after successfully parsed hunk

# regexp to match start of hunk, used groups - 1,3,4,6
re_hunk_start = re.compile(b"^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@")
re_hunk_start = re.compile(br"^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@")

self.errors = 0
# temp buffers for header and filenames info
Expand Down Expand Up @@ -516,7 +516,7 @@ def lineno(self):
filenames = False
headscan = True
else:
re_filename = b"^\+\+\+ ([^\t]+)"
re_filename = br"^\+\+\+ ([^\t]+)"
match = re.match(re_filename, line)
if not match:
warning("skipping invalid patch - no target filename at line %d" % (lineno+1))
Expand All @@ -542,7 +542,7 @@ def lineno(self):
continue

if hunkhead:
match = re.match(b"^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@(.*)", line)
match = re.match(br"^@@ -(\d+)(,(\d+))? \+(\d+)(,(\d+))? @@(.*)", line)
if not match:
if not p.hunks:
warning("skipping invalid patch with no hunks for file %s" % p.source)
Expand Down