# HG changeset patch # User Yuya Nishihara # Date 1504428441 -32400 # Node ID 0a2fd3bfc7045d9d626f3d72d5f463b02eb3feaa # Parent 5a1b41268b7c7418b3bdd446a6ff53fa7d694c86 py3: convert function name to bytes in ui.configwith() diff -r 5a1b41268b7c -r 0a2fd3bfc704 mercurial/ui.py --- a/mercurial/ui.py Wed Aug 23 01:23:16 2017 -0400 +++ b/mercurial/ui.py Sun Sep 03 17:47:21 2017 +0900 @@ -595,7 +595,7 @@ return convert(v) except (ValueError, error.ParseError): if desc is None: - desc = convert.__name__ + desc = pycompat.sysbytes(convert.__name__) raise error.ConfigError(_("%s.%s is not a valid %s ('%s')") % (section, name, desc, v)) diff -r 5a1b41268b7c -r 0a2fd3bfc704 tests/test-doctest.py --- a/tests/test-doctest.py Wed Aug 23 01:23:16 2017 -0400 +++ b/tests/test-doctest.py Sun Sep 03 17:47:21 2017 +0900 @@ -68,7 +68,7 @@ testmod('mercurial.subrepo') testmod('mercurial.templatefilters') testmod('mercurial.templater') -testmod('mercurial.ui', py3=False) # py3: __name__ +testmod('mercurial.ui') testmod('mercurial.url') testmod('mercurial.util', py3=False) # py3: multiple bytes/unicode issues testmod('mercurial.util', testtarget='platform')