# HG changeset patch # User Robert Stanca # Date 2016-04-02 14:33:11 # Node ID 18e738038d780e0fdd78aeff0b5c9f434d0d8d27 # Parent 2cd8c3b0bd11f5d323de7da7d59bd04effb83013 py3: use print_function in test-ancestor.py diff --git a/tests/test-ancestor.py b/tests/test-ancestor.py --- a/tests/test-ancestor.py +++ b/tests/test-ancestor.py @@ -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 test_missingancestors(seed, rng): 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 @@ graph = {0: [-1], 1: [0], 2: [1], 3: [1] 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 @@ def test_gca(): 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 diff --git a/tests/test-check-py3-compat.t b/tests/test-check-py3-compat.t --- a/tests/test-check-py3-compat.t +++ b/tests/test-check-py3-compat.t @@ -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' (, line *) (glob) tests/readlink.py: invalid syntax: invalid syntax (, line *) (glob) tests/silenttestrunner.py: invalid syntax: Missing parentheses in call to 'print' (, line *) (glob) - tests/test-ancestor.py: invalid syntax: Missing parentheses in call to 'print' (, line *) (glob) tests/test-batching.py: invalid syntax: invalid syntax (, line *) (glob) tests/test-bdiff.py: invalid syntax: invalid syntax (, line *) (glob) tests/test-context.py: invalid syntax: invalid syntax (, line *) (glob)