changeset 28676:a4803f35efba

py3: make test-walkrepo use print_function
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 29 Mar 2016 16:21:31 +0530
parents fcafd84bc9c5
children 2903558a6991
files tests/test-check-py3-compat.t tests/test-walkrepo.py
diffstat 2 files changed, 15 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-check-py3-compat.t	Tue Mar 29 16:14:58 2016 +0530
+++ b/tests/test-check-py3-compat.t	Tue Mar 29 16:21:31 2016 +0530
@@ -115,7 +115,6 @@
   tests/test-ui-verbosity.py requires print_function
   tests/test-url.py not using absolute_import
   tests/test-url.py requires print_function
-  tests/test-walkrepo.py requires print_function
 
 #if py3exe
   $ hg files 'set:(**.py)' | sed 's|\\|/|g' | xargs $PYTHON3 contrib/check-py3-compat.py
@@ -299,6 +298,5 @@
   tests/test-ui-color.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
   tests/test-ui-config.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
   tests/test-ui-verbosity.py: invalid syntax: Missing parentheses in call to 'print' (<unknown>, line *) (glob)
-  tests/test-walkrepo.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
 
 #endif
--- a/tests/test-walkrepo.py	Tue Mar 29 16:14:58 2016 +0530
+++ b/tests/test-walkrepo.py	Tue Mar 29 16:21:31 2016 +0530
@@ -1,4 +1,4 @@
-from __future__ import absolute_import
+from __future__ import absolute_import, print_function
 
 import os
 
@@ -34,29 +34,29 @@
 def runtest():
     reposet = frozenset(walkrepos('.', followsym=True))
     if sym and (len(reposet) != 3):
-        print "reposet = %r" % (reposet,)
-        print ("Found %d repositories when I should have found 3"
-               % (len(reposet),))
+        print("reposet = %r" % (reposet,))
+        print(("Found %d repositories when I should have found 3"
+               % (len(reposet),)))
     if (not sym) and (len(reposet) != 2):
-        print "reposet = %r" % (reposet,)
-        print ("Found %d repositories when I should have found 2"
-               % (len(reposet),))
+        print("reposet = %r" % (reposet,))
+        print(("Found %d repositories when I should have found 2"
+               % (len(reposet),)))
     sub1set = frozenset((pjoin('.', 'sub1'),
                          pjoin('.', 'circle', 'subdir', 'sub1')))
     if len(sub1set & reposet) != 1:
-        print "sub1set = %r" % (sub1set,)
-        print "reposet = %r" % (reposet,)
-        print "sub1set and reposet should have exactly one path in common."
+        print("sub1set = %r" % (sub1set,))
+        print("reposet = %r" % (reposet,))
+        print("sub1set and reposet should have exactly one path in common.")
     sub2set = frozenset((pjoin('.', 'subsub1'),
                          pjoin('.', 'subsubdir', 'subsub1')))
     if len(sub2set & reposet) != 1:
-        print "sub2set = %r" % (sub2set,)
-        print "reposet = %r" % (reposet,)
-        print "sub2set and reposet should have exactly one path in common."
+        print("sub2set = %r" % (sub2set,))
+        print("reposet = %r" % (reposet,))
+        print("sub2set and reposet should have exactly one path in common.")
     sub3 = pjoin('.', 'circle', 'top1')
     if sym and sub3 not in reposet:
-        print "reposet = %r" % (reposet,)
-        print "Symbolic links are supported and %s is not in reposet" % (sub3,)
+        print("reposet = %r" % (reposet,))
+        print("Symbolic links are supported and %s is not in reposet" % (sub3,))
 
 runtest()
 if sym: