Mercurial > hg
changeset 35897:4b1c04082cdc
py3: replace "if ispy3" by encoding.strtolocal()
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sat, 27 Jan 2018 13:09:49 +0900 |
| parents | ed3a7300b7b5 |
| children | a2b3b5c5a25a |
| files | mercurial/lock.py mercurial/ui.py |
| diffstat | 2 files changed, 2 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/lock.py Sat Feb 03 00:01:57 2018 -0500 +++ b/mercurial/lock.py Sat Jan 27 13:09:49 2018 +0900 @@ -30,9 +30,7 @@ confidence. Typically it's just hostname. On modern linux, we include an extra Linux-specific pid namespace identifier. """ - result = socket.gethostname() - if pycompat.ispy3: - result = result.encode(pycompat.sysstr(encoding.encoding), 'replace') + result = encoding.strtolocal(socket.gethostname()) if pycompat.sysplatform.startswith('linux'): try: result += '/%x' % os.stat('/proc/self/ns/pid').st_ino
--- a/mercurial/ui.py Sat Feb 03 00:01:57 2018 -0500 +++ b/mercurial/ui.py Sat Jan 27 13:09:49 2018 +0900 @@ -1508,11 +1508,7 @@ ''.join(exconly)) else: output = traceback.format_exception(exc[0], exc[1], exc[2]) - data = r''.join(output) - if pycompat.ispy3: - enc = pycompat.sysstr(encoding.encoding) - data = data.encode(enc, errors=r'replace') - self.write_err(data) + self.write_err(encoding.strtolocal(r''.join(output))) return self.tracebackflag or force def geteditor(self):