Mercurial > hg-stable
changeset 34083:871a58b5f428
py3: fix type of regex literals in patch.py
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 03 Sep 2017 16:12:15 +0900 |
| parents | c6c8a52e28c9 |
| children | 8b8b70cb4288 |
| files | mercurial/patch.py |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/patch.py Mon Aug 28 14:49:00 2017 -0700 +++ b/mercurial/patch.py Sun Sep 03 16:12:15 2017 +0900 @@ -205,10 +205,11 @@ # attempt to detect the start of a patch # (this heuristic is borrowed from quilt) - diffre = re.compile(r'^(?:Index:[ \t]|diff[ \t]|RCS file: |' - r'retrieving revision [0-9]+(\.[0-9]+)*$|' - r'---[ \t].*?^\+\+\+[ \t]|' - r'\*\*\*[ \t].*?^---[ \t])', re.MULTILINE|re.DOTALL) + diffre = re.compile(br'^(?:Index:[ \t]|diff[ \t]|RCS file: |' + br'retrieving revision [0-9]+(\.[0-9]+)*$|' + br'---[ \t].*?^\+\+\+[ \t]|' + br'\*\*\*[ \t].*?^---[ \t])', + re.MULTILINE | re.DOTALL) data = {} fd, tmpname = tempfile.mkstemp(prefix='hg-patch-') @@ -230,7 +231,7 @@ pend = subject.find(']') if pend >= 0: subject = subject[pend + 1:].lstrip() - subject = re.sub(r'\n[ \t]+', ' ', subject) + subject = re.sub(br'\n[ \t]+', ' ', subject) ui.debug('Subject: %s\n' % subject) if data['user']: ui.debug('From: %s\n' % data['user']) @@ -1760,7 +1761,7 @@ - ('hunk', [hunk_lines]) - ('range', (-start,len, +start,len, proc)) """ - lines_re = re.compile(r'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)') + lines_re = re.compile(br'@@ -(\d+),(\d+) \+(\d+),(\d+) @@\s*(.*)') lr = linereader(fp) def scanwhile(first, p):