diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist --- a/contrib/python3-whitelist +++ b/contrib/python3-whitelist @@ -474,6 +474,7 @@ test-pager.t test-parents.t test-parse-date.t +test-parseindex.t test-parseindex2.py test-patch-offset.t test-patch.t diff --git a/tests/test-parseindex.t b/tests/test-parseindex.t --- a/tests/test-parseindex.t +++ b/tests/test-parseindex.t @@ -27,7 +27,7 @@ $ cat >> test.py << EOF > from __future__ import print_function - > from mercurial import changelog, node, vfs + > from mercurial import changelog, node, pycompat, vfs > > class singlebyteread(object): > def __init__(self, real): @@ -55,10 +55,10 @@ > return singlebyteread(f) > return wrapper > - > cl = changelog.changelog(opener('.hg/store')) + > cl = changelog.changelog(opener(b'.hg/store')) > print(len(cl), 'revisions:') > for r in cl: - > print(node.short(cl.node(r))) + > print(pycompat.sysstr(node.short(cl.node(r)))) > EOF $ "$PYTHON" test.py 2 revisions: @@ -76,7 +76,7 @@ $ "$PYTHON" < from __future__ import print_function > from mercurial import changelog, vfs - > cl = changelog.changelog(vfs.vfs('.hg/store')) + > cl = changelog.changelog(vfs.vfs(b'.hg/store')) > print('good heads:') > for head in [0, len(cl) - 1, -1]: > print('%s: %r' % (head, cl.reachableroots(0, [head], [0]))) @@ -112,7 +112,7 @@ 10000: head out of range -2: head out of range -10000: head out of range - None: an integer is required + None: an integer is required( .got type NoneType.)? (re) good roots: 0: [0] 1: [1] @@ -123,7 +123,7 @@ -2: [] -10000: [] bad roots: - None: an integer is required + None: an integer is required( .got type NoneType.)? (re) $ cd .. @@ -178,8 +178,8 @@ $ cat < test.py > from __future__ import print_function > import sys - > from mercurial import changelog, vfs - > cl = changelog.changelog(vfs.vfs(sys.argv[1])) + > from mercurial import changelog, pycompat, vfs + > cl = changelog.changelog(vfs.vfs(pycompat.fsencode(sys.argv[1]))) > n0, n1 = cl.node(0), cl.node(1) > ops = [ > ('reachableroots',