Mercurial > hg-stable

changeset 34215:0a2fd3bfc704

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: convert function name to bytes in ui.configwith()
author Yuya Nishihara <yuya@tcha.org>
date Sun, 03 Sep 2017 17:47:21 +0900
parents 5a1b41268b7c
children da9c4b0693c5
files mercurial/ui.py tests/test-doctest.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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))
 
--- 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')