Mercurial > hg

diff mercurial/scmutil.py @ 48934:06de08b36c82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: use str instead of pycompat.unicode pycompat.unicode is an alias to str. Differential Revision: https://phab.mercurial-scm.org/D12340
author Gregory Szorc <gregory.szorc@gmail.com>
date Mon, 21 Feb 2022 11:24:57 -0700
parents f254fc73d956
children 642e31cb55f0
line wrap: on
line diff
--- a/mercurial/scmutil.py	Tue Mar 08 10:58:22 2022 +0100
+++ b/mercurial/scmutil.py	Mon Feb 21 11:24:57 2022 -0700
@@ -227,7 +227,7 @@
         except (AttributeError, IndexError):
             # it might be anything, for example a string
             reason = inst.reason
-        if isinstance(reason, pycompat.unicode):
+        if isinstance(reason, str):
             # SSLError of Python 2.7.9 contains a unicode
             reason = encoding.unitolocal(reason)
         ui.error(_(b"abort: error: %s\n") % stringutil.forcebytestr(reason))