changeset 31498:492c64afc54c

py3: make the regular expression bytes to prevent TypeError
author Pulkit Goyal <7895pulkit@gmail.com>
date Fri, 17 Mar 2017 05:10:58 +0530
parents 8122cc5cb543
children 3c77414a0f9c
files mercurial/dispatch.py mercurial/posix.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dispatch.py	Sat Feb 25 17:29:30 2017 +0900
+++ b/mercurial/dispatch.py	Fri Mar 17 05:10:58 2017 +0530
@@ -286,7 +286,7 @@
             if num < len(givenargs):
                 return givenargs[num]
             raise error.Abort(_('too few arguments for command alias'))
-        cmd = re.sub(r'\$(\d+|\$)', replacer, cmd)
+        cmd = re.sub(br'\$(\d+|\$)', replacer, cmd)
         givenargs = [x for i, x in enumerate(givenargs)
                      if i not in nums]
         args = pycompat.shlexsplit(cmd)
--- a/mercurial/posix.py	Sat Feb 25 17:29:30 2017 +0900
+++ b/mercurial/posix.py	Fri Mar 17 05:10:58 2017 +0530
@@ -408,7 +408,7 @@
         return '"%s"' % s
     global _needsshellquote
     if _needsshellquote is None:
-        _needsshellquote = re.compile(r'[^a-zA-Z0-9._/+-]').search
+        _needsshellquote = re.compile(br'[^a-zA-Z0-9._/+-]').search
     if s and not _needsshellquote(s):
         # "s" shouldn't have to be quoted
         return s