Mercurial > public > mercurial-scm > hg-stable
diff mercurial/scmutil.py @ 38321:79dd61a4554f
py3: replace `unicode` with pycompat.unicode
unicode() is not available on Python 3 and throws a NameError because unicodes
are now default str() on py3.
Differential Revision: https://phab.mercurial-scm.org/D3708
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 13 Jun 2018 22:51:08 +0530 |
| parents | d0abd7949ea3 |
| children | cf59de802883 |
line wrap: on
line diff
--- a/mercurial/scmutil.py Fri Jun 15 02:07:39 2018 +0530 +++ b/mercurial/scmutil.py Wed Jun 13 22:51:08 2018 +0530 @@ -233,7 +233,7 @@ except (AttributeError, IndexError): # it might be anything, for example a string reason = inst.reason - if isinstance(reason, unicode): + if isinstance(reason, pycompat.unicode): # SSLError of Python 2.7.9 contains a unicode reason = encoding.unitolocal(reason) ui.warn(_("abort: error: %s\n") % reason)