@@ -6,6 +6,8 @@

 ## License: GPL Version 2

 ## Copyright: TGRMN Software and contributors

+from __future__ import print_function

+

 from Utils import getTreeFromXml, deunicodise

 try:

@@ -222,11 +224,11 @@ if __name__ == "__main__":

 </AccessControlPolicy>

     """

     acl = ACL(xml)

-    print "Grants:", acl.getGrantList()

+    print("Grants:", acl.getGrantList())

     acl.revokeAnonRead()

-    print "Grants:", acl.getGrantList()

+    print("Grants:", acl.getGrantList())

     acl.grantAnonRead()

-    print "Grants:", acl.getGrantList()

-    print acl

+    print("Grants:", acl.getGrantList())

+    print(acl)

 # vim:et:ts=4:sts=4:ai

@@ -6,6 +6,8 @@

 ## License: GPL Version 2

 ## Copyright: TGRMN Software and contributors

+from __future__ import print_function

+

 import S3Uri

 from Exceptions import ParameterError

 from Utils import getTreeFromXml

@@ -80,14 +82,14 @@ __all__.append("AccessLog")

 if __name__ == "__main__":

     log = AccessLog()

-    print log

+    print(log)

     log.enableLogging(S3Uri.S3Uri(u"s3://targetbucket/prefix/log-"))

-    print log

+    print(log)

     log.setAclPublic(True)

-    print log

+    print(log)

     log.setAclPublic(False)

-    print log

+    print(log)

     log.disableLogging()

-    print log

+    print(log)

 # vim:et:ts=4:sts=4:ai

@@ -6,6 +6,8 @@

 ## License: GPL Version 2

 ## Copyright: TGRMN Software and contributors

+from __future__ import print_function

+

 import os

 import re

 import sys

@@ -185,39 +187,39 @@ class S3UriCloudFront(S3Uri):

 if __name__ == "__main__":

     uri = S3Uri("s3://bucket/object")

-    print "type()  =", type(uri)

-    print "uri     =", uri

-    print "uri.type=", uri.type

-    print "bucket  =", uri.bucket()

-    print "object  =", uri.object()

-    print

+    print("type()  =", type(uri))

+    print("uri     =", uri)

+    print("uri.type=", uri.type)

+    print("bucket  =", uri.bucket())

+    print("object  =", uri.object())

+    print()

     uri = S3Uri("s3://bucket")

-    print "type()  =", type(uri)

-    print "uri     =", uri

-    print "uri.type=", uri.type

-    print "bucket  =", uri.bucket()

-    print

+    print("type()  =", type(uri))

+    print("uri     =", uri)

+    print("uri.type=", uri.type)

+    print("bucket  =", uri.bucket())

+    print()

     uri = S3Uri("s3fs://filesystem1/path/to/remote/file.txt")

-    print "type()  =", type(uri)

-    print "uri     =", uri

-    print "uri.type=", uri.type

-    print "path    =", uri.path()

-    print

+    print("type()  =", type(uri))

+    print("uri     =", uri)

+    print("uri.type=", uri.type)

+    print("path    =", uri.path())

+    print()

     uri = S3Uri("/path/to/local/file.txt")

-    print "type()  =", type(uri)

-    print "uri     =", uri

-    print "uri.type=", uri.type

-    print "path    =", uri.path()

-    print

+    print("type()  =", type(uri))

+    print("uri     =", uri)

+    print("uri.type=", uri.type)

+    print("path    =", uri.path())

+    print()

     uri = S3Uri("cf://1234567890ABCD/")

-    print "type()  =", type(uri)

-    print "uri     =", uri

-    print "uri.type=", uri.type

-    print "dist_id =", uri.dist_id()

-    print

+    print("type()  =", type(uri))

+    print("uri     =", uri)

+    print("uri.type=", uri.type)

+    print("dist_id =", uri.dist_id())

+    print()

 # vim:et:ts=4:sts=4:ai

@@ -6,6 +6,8 @@

 ## License: GPL Version 2

 ## Copyright: TGRMN Software and contributors

+from __future__ import print_function

+

 from BidirMap import BidirMap

 class SortedDictIterator(object):

@@ -59,16 +61,16 @@ class SortedDict(dict):

 if __name__ == "__main__":

     d = { 'AWS' : 1, 'Action' : 2, 'america' : 3, 'Auckland' : 4, 'America' : 5 }

     sd = SortedDict(d)

-    print "Wanted: Action, america, Auckland, AWS,    [ignore case]"

-    print "Got:   ",

+    print("Wanted: Action, america, Auckland, AWS,    [ignore case]")

+    print("Got:   ", end=' ')

     for key in sd:

-        print "%s," % key,

-    print "   [used: __iter__()]"

+        print("%s," % key, end=' ')

+    print("   [used: __iter__()]")

     d = SortedDict(d, ignore_case = False)

-    print "Wanted: AWS, Action, Auckland, america,    [case sensitive]"

-    print "Got:   ",

+    print("Wanted: AWS, Action, Auckland, america,    [case sensitive]")

+    print("Got:   ", end=' ')

     for key in d.keys():

-        print "%s," % key,

-    print "   [used: keys()]"

+        print("%s," % key, end=' ')

+    print("   [used: keys()]")

 # vim:et:ts=4:sts=4:ai

@@ -7,6 +7,8 @@

 ## License: GPL Version 2

 ## Copyright: TGRMN Software and contributors

+from __future__ import print_function

+

 import sys

 import os

 import re

@@ -62,12 +64,12 @@ elif os.name == "nt" and os.getenv("USERPROFILE"):

 if not os.path.isdir('testsuite') and os.path.isfile('testsuite.tar.gz'):

     os.system("tar -xz -f testsuite.tar.gz")

 if not os.path.isdir('testsuite'):

-    print "Something went wrong while unpacking testsuite.tar.gz"

+    print("Something went wrong while unpacking testsuite.tar.gz")

     sys.exit(1)

 os.system("tar -xf testsuite/checksum.tar -C testsuite")

 if not os.path.isfile('testsuite/checksum/cksum33.txt'):

-    print "Something went wrong while unpacking testsuite/checkum.tar"

+    print("Something went wrong while unpacking testsuite/checkum.tar")

     sys.exit(1)

 ## Fix up permissions for permission-denied tests

@@ -81,10 +83,10 @@ patterns['GBK'] = u"12月31日/1-特色條目"

 encoding = locale.getpreferredencoding()

 if not encoding:

-    print "Guessing current system encoding failed. Consider setting $LANG variable."

+    print("Guessing current system encoding failed. Consider setting $LANG variable.")

     sys.exit(1)

 else:

-    print "System encoding: " + encoding

+    print("System encoding: " + encoding)

 have_encoding = os.path.isdir('testsuite/encodings/' + encoding)

 if not have_encoding and os.path.isfile('testsuite/encodings/%s.tar.gz' % encoding):

@@ -95,7 +97,7 @@ if have_encoding:

     #enc_base_remote = "%s/xyz/%s/" % (pbucket(1), encoding)

     enc_pattern = patterns[encoding]

 else:

-    print encoding + " specific files not found."

+    print(encoding + " specific files not found.")

 if not os.path.isdir('testsuite/crappy-file-name'):

     os.system("tar xvz -C testsuite -f testsuite/crappy-file-name.tar.gz")

@@ -104,17 +106,17 @@ if not os.path.isdir('testsuite/crappy-file-name'):

 def test(label, cmd_args = [], retcode = 0, must_find = [], must_not_find = [], must_find_re = [], must_not_find_re = [], stdin = None):

     def command_output():

-        print "----"

-        print " ".join([" " in arg and "'%s'" % arg or arg for arg in cmd_args])

-        print "----"

-        print stdout

-        print "----"

+        print("----")

+        print(" ".join([" " in arg and "'%s'" % arg or arg for arg in cmd_args]))

+        print("----")

+        print(stdout)

+        print("----")

     def failure(message = ""):

         global count_fail

         if message:

             message = u"  (%r)" % message

-        print u"\x1b[31;1mFAIL%s\x1b[0m" % (message)

+        print(u"\x1b[31;1mFAIL%s\x1b[0m" % (message))

         count_fail += 1

         command_output()

         #return 1

@@ -123,7 +125,7 @@ def test(label, cmd_args = [], retcode = 0, must_find = [], must_not_find = [],

         global count_pass

         if message:

             message = "  (%r)" % message

-        print "\x1b[32;1mOK\x1b[0m%s" % (message)

+        print("\x1b[32;1mOK\x1b[0m%s" % (message))

         count_pass += 1

         if verbose:

             command_output()

@@ -132,7 +134,7 @@ def test(label, cmd_args = [], retcode = 0, must_find = [], must_not_find = [],

         global count_skip

         if message:

             message = "  (%r)" % message

-        print "\x1b[33;1mSKIP\x1b[0m%s" % (message)

+        print("\x1b[33;1mSKIP\x1b[0m%s" % (message))

         count_skip += 1

         return 0

     def compile_list(_list, regexps = False):

@@ -143,7 +145,7 @@ def test(label, cmd_args = [], retcode = 0, must_find = [], must_not_find = [],

     global test_counter

     test_counter += 1

-    print ("%3d  %s " % (test_counter, label)).ljust(30, "."),

+    print(("%3d  %s " % (test_counter, label)).ljust(30, "."), end=' ')

     sys.stdout.flush()

     if run_tests.count(test_counter) == 0 or exclude_tests.count(test_counter) > 0:

@@ -202,7 +204,7 @@ def test_mkdir(label, dir_name):

     if os.name in ("posix", "nt"):

         cmd = ['mkdir', '-p']

     else:

-        print "Unknown platform: %s" % os.name

+        print("Unknown platform: %s" % os.name)

         sys.exit(1)

     cmd.append(dir_name)

     return test(label, cmd)

@@ -214,7 +216,7 @@ def test_rmdir(label, dir_name):

         elif os.name == "nt":

             cmd = ['rmdir', '/s/q']

         else:

-            print "Unknown platform: %s" % os.name

+            print("Unknown platform: %s" % os.name)

             sys.exit(1)

         cmd.append(dir_name)

         return test(label, cmd)

@@ -231,7 +233,7 @@ def test_copy(label, src_file, dst_file):

     elif os.name == "nt":

         cmd = ['copy']

     else:

-        print "Unknown platform: %s" % os.name

+        print("Unknown platform: %s" % os.name)

         sys.exit(1)

     cmd.append(src_file)

     cmd.append(dst_file)

@@ -248,11 +250,11 @@ argv = sys.argv[1:]

 while argv:

     arg = argv.pop(0)

     if arg.startswith('--bucket-prefix='):

-        print "Usage: '--bucket-prefix PREFIX', not '--bucket-prefix=PREFIX'"

+        print("Usage: '--bucket-prefix PREFIX', not '--bucket-prefix=PREFIX'")

         sys.exit(0)

     if arg in ("-h", "--help"):

-        print "%s A B K..O -N" % sys.argv[0]

-        print "Run tests number A, B and K through to O, except for N"

+        print("%s A B K..O -N" % sys.argv[0])

+        print("Run tests number A, B and K through to O, except for N")

         sys.exit(0)

     if arg in ("-c", "--config"):

@@ -268,7 +270,7 @@ while argv:

         try:

             bucket_prefix = argv.pop(0)

         except IndexError:

-            print "Bucket prefix option must explicitly supply a bucket name prefix"

+            print("Bucket prefix option must explicitly supply a bucket name prefix")

             sys.exit(0)

         continue

     if ".." in arg:

@@ -281,7 +283,7 @@ while argv:

     else:

         run_tests.append(int(arg))

-print "Using bucket prefix: '%s'" % bucket_prefix

+print("Using bucket prefix: '%s'" % bucket_prefix)

 cfg = S3.Config.Config(config_file)

@@ -1,17 +1,19 @@

 #!/usr/bin/env python2

 # -*- coding=utf-8 -*-

+from __future__ import print_function

+

 import sys

 import os

 try:

     import xml.etree.ElementTree

-    print "Using xml.etree.ElementTree for XML processing"

+    print("Using xml.etree.ElementTree for XML processing")

 except ImportError, e:

     sys.stderr.write(str(e) + "\n")

     try:

         import elementtree.ElementTree

-        print "Using elementtree.ElementTree for XML processing"

+        print("Using elementtree.ElementTree for XML processing")

     except ImportError, e:

         sys.stderr.write(str(e) + "\n")

         sys.stderr.write("Please install ElementTree module from\n")