# HG changeset patch # User Gregory Szorc # Date 1551561353 28800 # Node ID 82d9728ace9535057d77df6c920385861ec00072 # Parent 25694a78e4a4fb5f5f3bf6f568fce951ca10254a global: use raw string for setlocale() argument Otherwise Python 2 will coerce a unicode to str, which fails on HGUNICODEPEDANTRY=1. Differential Revision: https://phab.mercurial-scm.org/D6052 diff -r 25694a78e4a4 -r 82d9728ace95 hgext/histedit.py --- a/hgext/histedit.py Sat Mar 02 13:07:58 2019 -0800 +++ b/hgext/histedit.py Sat Mar 02 13:15:53 2019 -0800 @@ -953,7 +953,7 @@ # locale. This sets the locale to the user's default system # locale. import locale - locale.setlocale(locale.LC_ALL, u'') + locale.setlocale(locale.LC_ALL, r'') except ImportError: curses = None diff -r 25694a78e4a4 -r 82d9728ace95 mercurial/crecord.py --- a/mercurial/crecord.py Sat Mar 02 13:07:58 2019 -0800 +++ b/mercurial/crecord.py Sat Mar 02 13:15:53 2019 -0800 @@ -30,7 +30,7 @@ # This is required for ncurses to display non-ASCII characters in default user # locale encoding correctly. --immerrr -locale.setlocale(locale.LC_ALL, u'') +locale.setlocale(locale.LC_ALL, r'') # patch comments based on the git one diffhelptext = _("""# To remove '-' lines, make them ' ' lines (context).