Mercurial > hg
changeset 28723:18e738038d78
py3: use print_function in test-ancestor.py
| author | Robert Stanca <robert.stanca7@gmail.com> |
|---|---|
| date | Sat, 02 Apr 2016 17:33:11 +0300 |
| parents | 2cd8c3b0bd11 |
| children | cf339d6ac7c7 |
| files | tests/test-ancestor.py tests/test-check-py3-compat.t |
| diffstat | 2 files changed, 15 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-ancestor.py Sat Apr 02 17:29:38 2016 +0300 +++ b/tests/test-ancestor.py Sat Apr 02 17:33:11 2016 +0300 @@ -1,4 +1,4 @@ -from __future__ import absolute_import +from __future__ import absolute_import, print_function import binascii import getopt @@ -94,13 +94,13 @@ def err(seed, graph, bases, seq, output, expected): if nerrs[0] == 0: - print >> sys.stderr, 'seed:', hex(seed)[:-1] + print('seed:', hex(seed)[:-1], file=sys.stderr) if gerrs[0] == 0: - print >> sys.stderr, 'graph:', graph - print >> sys.stderr, '* bases:', bases - print >> sys.stderr, '* seq: ', seq - print >> sys.stderr, '* output: ', output - print >> sys.stderr, '* expected:', expected + print('graph:', graph, file=sys.stderr) + print('* bases:', bases, file=sys.stderr) + print('* seq: ', seq, file=sys.stderr) + print('* output: ', output, file=sys.stderr) + print('* expected:', expected, file=sys.stderr) nerrs[0] += 1 gerrs[0] += 1 @@ -178,14 +178,14 @@ 13: [8]} def genlazyancestors(revs, stoprev=0, inclusive=False): - print ("%% lazy ancestor set for %s, stoprev = %s, inclusive = %s" % - (revs, stoprev, inclusive)) + print(("%% lazy ancestor set for %s, stoprev = %s, inclusive = %s" % + (revs, stoprev, inclusive))) return ancestor.lazyancestors(graph.get, revs, stoprev=stoprev, inclusive=inclusive) def printlazyancestors(s, l): - print 'membership: %r' % [n for n in l if n in s] - print 'iteration: %r' % list(s) + print('membership: %r' % [n for n in l if n in s]) + print('iteration: %r' % list(s)) def test_lazyancestors(): # Empty revs @@ -235,9 +235,10 @@ cgcas = sorted(cl.index.ancestors(a, b)) pygcas = sorted(ancestor.ancestors(cl.parentrevs, a, b)) if cgcas != pygcas: - print "test_gca: for dag %s, gcas for %d, %d:" % (dag, a, b) - print " C returned: %s" % cgcas - print " Python returned: %s" % pygcas + print("test_gca: for dag %s, gcas for %d, %d:" + % (dag, a, b)) + print(" C returned: %s" % cgcas) + print(" Python returned: %s" % pygcas) def main(): seed = None
--- a/tests/test-check-py3-compat.t Sat Apr 02 17:29:38 2016 +0300 +++ b/tests/test-check-py3-compat.t Sat Apr 02 17:33:11 2016 +0300 @@ -59,7 +59,6 @@ tests/sitecustomize.py not using absolute_import tests/svn-safe-append.py not using absolute_import tests/svnxml.py not using absolute_import - tests/test-ancestor.py requires print_function tests/test-atomictempfile.py not using absolute_import tests/test-batching.py not using absolute_import tests/test-batching.py requires print_function @@ -265,7 +264,6 @@ tests/get-with-headers.py: invalid syntax: Missing parentheses in call to 'print' (<unknown>, line *) (glob) tests/readlink.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) tests/silenttestrunner.py: invalid syntax: Missing parentheses in call to 'print' (<unknown>, line *) (glob) - tests/test-ancestor.py: invalid syntax: Missing parentheses in call to 'print' (<unknown>, line *) (glob) tests/test-batching.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) tests/test-bdiff.py: invalid syntax: invalid syntax (<unknown>, line *) (glob) tests/test-context.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)