[PATCH 2 of 2] py3: fix str vs bytes in enough places to run `hg version` on Windows
Matt Harbison
mharbison72 at gmail.com
Fri Sep 14 00:52:34 EDT 2018
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1536890820 14400
# Thu Sep 13 22:07:00 2018 -0400
# Node ID a1c3c33e911a449c1e67d6c70a1320f34233f253
# Parent 82be987da1489e3ff7411540b473690e6039fd67
py3: fix str vs bytes in enough places to run `hg version` on Windows
I don't have Visual Studio 2015 at home, but this now works with a handful of
extensions (blackbox, extdiff, patchbomb, phabricator and rebase, but not
evolve):
$ HGMODULEPOLICY=py py -3 ../hg version
Enabling the evolve extension causes the usual "failed to import ..." line, but
then print this before the usual version output:
('commit', '[b'debugancestor', b'debugapplystreamclonebundle', ...,
b'verify', b'version']')
... where the elided part seems to be every command and alias known.
I'm not at all clear on when to use pycompat.sysstr() vs
encoding.unifromlocal(), but I think it's encoding.* for things the user inputs
or would be user facing? I would have thought that this meant using encoding.*
for these windows.py changes, but then test-help.t fails.
diff --git a/mercurial/color.py b/mercurial/color.py
--- a/mercurial/color.py
+++ b/mercurial/color.py
@@ -408,21 +408,21 @@ if pycompat.iswindows:
_INVALID_HANDLE_VALUE = -1
class _COORD(ctypes.Structure):
- _fields_ = [('X', ctypes.c_short),
- ('Y', ctypes.c_short)]
+ _fields_ = [(r'X', ctypes.c_short),
+ (r'Y', ctypes.c_short)]
class _SMALL_RECT(ctypes.Structure):
- _fields_ = [('Left', ctypes.c_short),
- ('Top', ctypes.c_short),
- ('Right', ctypes.c_short),
- ('Bottom', ctypes.c_short)]
+ _fields_ = [(r'Left', ctypes.c_short),
+ (r'Top', ctypes.c_short),
+ (r'Right', ctypes.c_short),
+ (r'Bottom', ctypes.c_short)]
class _CONSOLE_SCREEN_BUFFER_INFO(ctypes.Structure):
- _fields_ = [('dwSize', _COORD),
- ('dwCursorPosition', _COORD),
- ('wAttributes', _WORD),
- ('srWindow', _SMALL_RECT),
- ('dwMaximumWindowSize', _COORD)]
+ _fields_ = [(r'dwSize', _COORD),
+ (r'dwCursorPosition', _COORD),
+ (r'wAttributes', _WORD),
+ (r'srWindow', _SMALL_RECT),
+ (r'dwMaximumWindowSize', _COORD)]
_STD_OUTPUT_HANDLE = 0xfffffff5 # (DWORD)-11
_STD_ERROR_HANDLE = 0xfffffff4 # (DWORD)-12
@@ -484,7 +484,7 @@ if pycompat.iswindows:
w32effects = None
else:
origattr = csbi.wAttributes
- ansire = re.compile('\033\[([^m]*)m([^\033]*)(.*)',
+ ansire = re.compile(r'\033\[([^m]*)m([^\033]*)(.*)',
re.MULTILINE | re.DOTALL)
def win32print(ui, writefunc, *msgs, **opts):
@@ -520,16 +520,16 @@ if pycompat.iswindows:
text = '\033[m' + text
# Look for ANSI-like codes embedded in text
- m = re.match(ansire, text)
+ m = re.match(ansire, pycompat.sysstr(text))
try:
while m:
- for sattr in m.group(1).split(';'):
+ for sattr in m.group(1).split(r';'):
if sattr:
attr = mapcolor(int(sattr), attr)
ui.flush()
_kernel32.SetConsoleTextAttribute(stdout, attr)
- writefunc(m.group(2), **opts)
+ writefunc(encoding.unitolocal(m.group(2)), **opts)
m = re.match(ansire, m.group(3))
finally:
# Explicitly reset original attributes
diff --git a/mercurial/pure/osutil.py b/mercurial/pure/osutil.py
--- a/mercurial/pure/osutil.py
+++ b/mercurial/pure/osutil.py
@@ -193,7 +193,8 @@ else:
def _raiseioerror(name):
err = ctypes.WinError()
- raise IOError(err.errno, '%s: %s' % (name, err.strerror))
+ raise IOError(err.errno, r'%s: %s' % (pycompat.sysstr(name),
+ err.strerror))
class posixfile(object):
'''a file object aiming for POSIX-like semantics
@@ -207,14 +208,14 @@ else:
remains but cannot be opened again or be recreated under the same name,
until all reading processes have closed the file.'''
- def __init__(self, name, mode='r', bufsize=-1):
- if 'b' in mode:
+ def __init__(self, name, mode=b'r', bufsize=-1):
+ if b'b' in mode:
flags = _O_BINARY
else:
flags = _O_TEXT
- m0 = mode[0]
- if m0 == 'r' and '+' not in mode:
+ m0 = mode[0:1]
+ if m0 == b'r' and b'+' not in mode:
flags |= _O_RDONLY
access = _GENERIC_READ
else:
@@ -223,15 +224,15 @@ else:
flags |= _O_RDWR
access = _GENERIC_READ | _GENERIC_WRITE
- if m0 == 'r':
+ if m0 == b'r':
creation = _OPEN_EXISTING
- elif m0 == 'w':
+ elif m0 == b'w':
creation = _CREATE_ALWAYS
- elif m0 == 'a':
+ elif m0 == b'a':
creation = _OPEN_ALWAYS
flags |= _O_APPEND
else:
- raise ValueError("invalid mode: %s" % mode)
+ raise ValueError(r"invalid mode: %s" % pycompat.sysstr(mode))
fh = _kernel32.CreateFileA(name, access,
_FILE_SHARE_READ | _FILE_SHARE_WRITE | _FILE_SHARE_DELETE,
diff --git a/mercurial/windows.py b/mercurial/windows.py
--- a/mercurial/windows.py
+++ b/mercurial/windows.py
@@ -398,10 +398,11 @@ def shellquote(s):
# drops it. It will leave the next character, even if it is another
# "\".
_needsshellquote = re.compile(r'[^a-zA-Z0-9._:/-]').search
- if s and not _needsshellquote(s) and not _quotere.search(s):
+ u = pycompat.sysstr(s)
+ if s and not _needsshellquote(u) and not _quotere.search(u):
# "s" shouldn't have to be quoted
return s
- return '"%s"' % _quotere.sub(r'\1\1\\\2', s)
+ return pycompat.bytestr(r'"%s"' % _quotere.sub(r'\1\1\\\2', u))
def _unquote(s):
if s.startswith(b'"') and s.endswith(b'"'):
More information about the Mercurial-devel
mailing list