diff mercurial/dispatch.py @ 35145:25c543944bc0

py3: add b'' to regular expressions which are raw strings Differential Revision: https://phab.mercurial-scm.org/D1538
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 29 Nov 2017 04:47:27 +0530
parents fe987d0b9e1e
children e6487522ef92
line wrap: on
line diff
--- a/mercurial/dispatch.py	Wed Nov 29 04:41:19 2017 +0530
+++ b/mercurial/dispatch.py	Wed Nov 29 04:47:27 2017 +0530
@@ -404,7 +404,7 @@
     # tokenize each argument into exactly one word.
     replacemap['"$@"'] = ' '.join(util.shellquote(arg) for arg in args)
     # escape '\$' for regex
-    regex = '|'.join(replacemap.keys()).replace('$', r'\$')
+    regex = '|'.join(replacemap.keys()).replace('$', br'\$')
     r = re.compile(regex)
     return r.sub(lambda x: replacemap[x.group()], cmd)
 
@@ -449,7 +449,7 @@
                                  "of %i variable in alias '%s' definition."
                                  % (int(m.groups()[0]), self.name))
                         return ''
-                cmd = re.sub(r'\$(\d+|\$)', _checkvar, self.definition[1:])
+                cmd = re.sub(br'\$(\d+|\$)', _checkvar, self.definition[1:])
                 cmd = aliasinterpolate(self.name, args, cmd)
                 return ui.system(cmd, environ=env,
                                  blockedtag='alias_%s' % self.name)