[PATCH 2 of 5 V2] tests: use absolute_import, print_function in multiple files

Robert Stanca robert.stanca7 at gmail.com
Thu Mar 31 22:12:04 EDT 2016


# HG changeset patch
# User Robert Stanca <robert.stanca7 at gmail.com>
# Date 1459467236 -10800
#      Fri Apr 01 02:33:56 2016 +0300
# Node ID 0f544484e1633b9be6a5d6f44598589f48fed347
# Parent  63418ac38fa7b4878ca074f6f8f1b8dbe7dc376c
tests: use absolute_import, print_function in multiple files

Eliminate Python3 compatibility warnings

diff -r 63418ac38fa7 -r 0f544484e163 tests/test-check-py3-compat.t
--- a/tests/test-check-py3-compat.t	Fri Apr 01 02:09:39 2016 +0300
+++ b/tests/test-check-py3-compat.t	Fri Apr 01 02:33:56 2016 +0300
@@ -68,12 +68,6 @@
   tests/test-demandimport.py not using absolute_import
   tests/test-demandimport.py requires print_function
   tests/test-doctest.py not using absolute_import
-  tests/test-duplicateoptions.py not using absolute_import
-  tests/test-duplicateoptions.py requires print_function
-  tests/test-filecache.py not using absolute_import
-  tests/test-filecache.py requires print_function
-  tests/test-filelog.py not using absolute_import
-  tests/test-filelog.py requires print_function
   tests/test-hg-parseurl.py not using absolute_import
   tests/test-hg-parseurl.py requires print_function
   tests/test-hgweb-auth.py not using absolute_import
@@ -275,9 +269,6 @@
   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-demandimport.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
-  tests/test-duplicateoptions.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
-  tests/test-filecache.py: invalid syntax: Missing parentheses in call to 'print' (<unknown>, line *) (glob)
-  tests/test-filelog.py: invalid syntax: Missing parentheses in call to 'print' (<unknown>, line *) (glob)
   tests/test-hg-parseurl.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
   tests/test-hgweb-auth.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
   tests/test-hybridencode.py: invalid syntax: invalid syntax (<unknown>, line *) (glob)
diff -r 63418ac38fa7 -r 0f544484e163 tests/test-duplicateoptions.py
--- a/tests/test-duplicateoptions.py	Fri Apr 01 02:09:39 2016 +0300
+++ b/tests/test-duplicateoptions.py	Fri Apr 01 02:33:56 2016 +0300
@@ -1,5 +1,10 @@
+from __future__ import absolute_import, print_function
 import os
-from mercurial import ui, commands, extensions
+from mercurial import (
+    ui,
+    commands,
+    extensions,
+)
 
 ignore = set(['highlight', 'win32text', 'factotum'])
 
@@ -31,6 +36,6 @@
     for option in entry[1]:
         if (option[0] and option[0] in seenshort) or \
            (option[1] and option[1] in seenlong):
-            print "command '" + cmd + "' has duplicate option " + str(option)
+            print("command '" + cmd + "' has duplicate option " + str(option))
         seenshort.add(option[0])
         seenlong.add(option[1])
diff -r 63418ac38fa7 -r 0f544484e163 tests/test-filecache.py
--- a/tests/test-filecache.py	Fri Apr 01 02:09:39 2016 +0300
+++ b/tests/test-filecache.py	Fri Apr 01 02:33:56 2016 +0300
@@ -1,4 +1,7 @@
-import sys, os, subprocess
+from __future__ import absolute_import, print_function
+import os
+import subprocess
+import sys
 
 if subprocess.call(['python', '%s/hghave' % os.environ['TESTDIR'],
                     'cacheable']):
@@ -20,7 +23,7 @@
 
     @filecache('x', 'y')
     def cached(self):
-        print 'creating'
+        print('creating')
         return 'string from function'
 
     def invalidate(self):
@@ -31,12 +34,12 @@
                 pass
 
 def basic(repo):
-    print "* neither file exists"
+    print("* neither file exists")
     # calls function
     repo.cached
 
     repo.invalidate()
-    print "* neither file still exists"
+    print("* neither file still exists")
     # uses cache
     repo.cached
 
@@ -44,7 +47,7 @@
     f = open('x', 'w')
     f.close()
     repo.invalidate()
-    print "* empty file x created"
+    print("* empty file x created")
     # should recreate the object
     repo.cached
 
@@ -52,12 +55,12 @@
     f.write('a')
     f.close()
     repo.invalidate()
-    print "* file x changed size"
+    print("* file x changed size")
     # should recreate the object
     repo.cached
 
     repo.invalidate()
-    print "* nothing changed with either file"
+    print("* nothing changed with either file")
     # stats file again, reuses object
     repo.cached
 
@@ -69,14 +72,14 @@
     f.close()
 
     repo.invalidate()
-    print "* file x changed inode"
+    print("* file x changed inode")
     repo.cached
 
     # create empty file y
     f = open('y', 'w')
     f.close()
     repo.invalidate()
-    print "* empty file y created"
+    print("* empty file y created")
     # should recreate the object
     repo.cached
 
@@ -84,7 +87,7 @@
     f.write('A')
     f.close()
     repo.invalidate()
-    print "* file y changed size"
+    print("* file y changed size")
     # should recreate the object
     repo.cached
 
@@ -93,7 +96,7 @@
     f.close()
 
     repo.invalidate()
-    print "* file y changed inode"
+    print("* file y changed inode")
     repo.cached
 
     f = scmutil.opener('.')('x', 'w', atomictemp=True)
@@ -104,7 +107,7 @@
     f.close()
 
     repo.invalidate()
-    print "* both files changed inode"
+    print("* both files changed inode")
     repo.cached
 
 def fakeuncacheable():
@@ -149,36 +152,36 @@
     os.remove('y')
     repo.cached = 'string set externally'
     repo.invalidate()
-    print "* neither file exists"
-    print repo.cached
+    print("* neither file exists")
+    print(repo.cached)
     repo.invalidate()
     f = open('x', 'w')
     f.write('a')
     f.close()
-    print "* file x created"
-    print repo.cached
+    print("* file x created")
+    print(repo.cached)
 
     repo.cached = 'string 2 set externally'
     repo.invalidate()
-    print "* string set externally again"
-    print repo.cached
+    print("* string set externally again")
+    print(repo.cached)
 
     repo.invalidate()
     f = open('y', 'w')
     f.write('b')
     f.close()
-    print "* file y created"
-    print repo.cached
+    print("* file y created")
+    print(repo.cached)
 
-print 'basic:'
-print
+print('basic:')
+print()
 basic(fakerepo())
-print
-print 'fakeuncacheable:'
-print
+print()
+print('fakeuncacheable:')
+print()
 fakeuncacheable()
 test_filecache_synced()
-print
-print 'setbeforeget:'
-print
+print()
+print('setbeforeget:')
+print()
 setbeforeget(fakerepo())
diff -r 63418ac38fa7 -r 0f544484e163 tests/test-filelog.py
--- a/tests/test-filelog.py	Fri Apr 01 02:09:39 2016 +0300
+++ b/tests/test-filelog.py	Fri Apr 01 02:33:56 2016 +0300
@@ -2,8 +2,15 @@
 """
 Tests the behavior of filelog w.r.t. data starting with '\1\n'
 """
-from mercurial import ui, hg
-from mercurial.node import nullid, hex
+from __future__ import absolute_import, print_function
+from mercurial import (
+    ui,
+    hg,
+)
+from mercurial.node import (
+    nullid,
+    hex,
+)
 
 myui = ui.ui()
 repo = hg.repository(myui, path='.', create=True)
@@ -30,7 +37,7 @@
             lock.release()
 
 def error(text):
-    print 'ERROR: ' + text
+    print('ERROR: ' + text)
 
 textwith = '\1\nfoo'
 without = 'foo'
@@ -52,4 +59,4 @@
 if fl.size(1) != len(textwith):
     error('filelog.size for a renaming + data starting with \\1\\n')
 
-print 'OK.'
+print('OK.')


More information about the Mercurial-devel mailing list