Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: convert system strings to bytes in doctest of formatter.py
authorYuya Nishihara <yuya@tcha.org>
Sun, 17 Sep 2017 12:39:53 +0900
changeset 34256 ebe3d0095c69
parent 34255 d6af8da4a3b8
child 34257 2844c4bd5a39
py3: convert system strings to bytes in doctest of formatter.py
mercurial/formatter.py file | annotate | diff | comparison | revisions
tests/test-doctest.py file | annotate | diff | comparison | revisions 
--- a/mercurial/formatter.py	Sun Sep 17 12:39:14 2017 +0900
+++ b/mercurial/formatter.py	Sun Sep 17 12:39:53 2017 +0900
@@ -48,7 +48,8 @@
 ...     ui.verbose = verbose
 ...     ui.pushbuffer()
 ...     try:
-...         return fn(ui, ui.formatter(fn.__name__, opts))
+...         return fn(ui, ui.formatter(pycompat.sysbytes(fn.__name__),
+...                   pycompat.byteskwargs(opts)))
 ...     finally:
 ...         print(pycompat.sysstr(ui.popbuffer()), end='')
 
--- a/tests/test-doctest.py	Sun Sep 17 12:39:14 2017 +0900
+++ b/tests/test-doctest.py	Sun Sep 17 12:39:53 2017 +0900
@@ -51,7 +51,7 @@
 testmod('mercurial.dagparser', optionflags=doctest.NORMALIZE_WHITESPACE)
 testmod('mercurial.dispatch')
 testmod('mercurial.encoding')
-testmod('mercurial.formatter', py3=False)  # py3: write bytes to stdout
+testmod('mercurial.formatter')
 testmod('mercurial.hg')
 testmod('mercurial.hgweb.hgwebdir_mod', py3=False)  # py3: repr(bytes) ?
 testmod('mercurial.match')
mercurial