diff -r 47f5454a30ed -r 79dd61a4554f mercurial/i18n.py --- a/mercurial/i18n.py Fri Jun 15 02:07:39 2018 +0530 +++ b/mercurial/i18n.py Wed Jun 13 22:51:08 2018 +0530 @@ -23,11 +23,6 @@ else: module = pycompat.fsencode(__file__) -try: - unicode -except NameError: - unicode = str - _languages = None if (pycompat.iswindows and 'LANGUAGE' not in encoding.environ @@ -76,7 +71,7 @@ cache = _msgcache.setdefault(encoding.encoding, {}) if message not in cache: - if type(message) is unicode: + if type(message) is pycompat.unicode: # goofy unicode docstrings in test paragraphs = message.split(u'\n\n') else: