# HG changeset patch # User Yuya Nishihara # Date 1504418483 -32400 # Node ID 6d21737c35bfa5b008aff546fe71671f494369b5 # Parent 8b8b70cb4288a40119d0268d9283d6bd1df3b469 py3: fix type of regex literals in subrepo.py diff -r 8b8b70cb4288 -r 6d21737c35bf mercurial/subrepo.py --- a/mercurial/subrepo.py Sun Sep 03 16:19:20 2017 +0900 +++ b/mercurial/subrepo.py Sun Sep 03 15:01:23 2017 +0900 @@ -134,7 +134,7 @@ # However, we still want to allow back references to go # through unharmed, so we turn r'\\1' into r'\1'. Again, # extra escapes are needed because re.sub string decodes. - repl = re.sub(r'\\\\([0-9]+)', r'\\\1', repl) + repl = re.sub(br'\\\\([0-9]+)', br'\\\1', repl) try: src = re.sub(pattern, repl, src, 1) except re.error as e: @@ -1154,7 +1154,7 @@ @propertycache def _svnversion(self): output, err = self._svncommand(['--version', '--quiet'], filename=None) - m = re.search(r'^(\d+)\.(\d+)', output) + m = re.search(br'^(\d+)\.(\d+)', output) if not m: raise error.Abort(_('cannot retrieve svn tool version')) return (int(m.group(1)), int(m.group(2))) @@ -1373,11 +1373,11 @@ @staticmethod def _gitversion(out): - m = re.search(r'^git version (\d+)\.(\d+)\.(\d+)', out) + m = re.search(br'^git version (\d+)\.(\d+)\.(\d+)', out) if m: return (int(m.group(1)), int(m.group(2)), int(m.group(3))) - m = re.search(r'^git version (\d+)\.(\d+)', out) + m = re.search(br'^git version (\d+)\.(\d+)', out) if m: return (int(m.group(1)), int(m.group(2)), 0)