From 727cb8a917bb524045bccb5cc5311f0f96261410 Mon Sep 17 00:00:00 2001 From: Marius Gedminas Date: Thu, 27 Aug 2015 22:02:35 +0300 Subject: [PATCH] Support print() function in test/ --- test/integration/cleanup_ec2.py | 4 ++-- test/integration/cleanup_gce.py | 2 +- test/integration/consul_running.py | 2 +- test/integration/setup_gce.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/integration/cleanup_ec2.py b/test/integration/cleanup_ec2.py index 48db7572cef..559a5c0ae1a 100644 --- a/test/integration/cleanup_ec2.py +++ b/test/integration/cleanup_ec2.py @@ -57,7 +57,7 @@ def delete_aws_eips(get_func, attr, opts): try: eip_log = open(opts.eip_log, 'r').read().splitlines() except IOError: - print opts.eip_log, 'not found.' + print('%s not found.' % opts.eip_log) return for item in get_func(): @@ -176,4 +176,4 @@ if __name__ == '__main__': delete_aws_instances(aws.get_all_instances(filters=filters), opts) except KeyboardInterrupt as e: - print "\nExiting on user command." + print("\nExiting on user command.") diff --git a/test/integration/cleanup_gce.py b/test/integration/cleanup_gce.py index 0dc0555c452..c807ebb81a6 100644 --- a/test/integration/cleanup_gce.py +++ b/test/integration/cleanup_gce.py @@ -74,4 +74,4 @@ if __name__ == '__main__': # Delete matching disks delete_gce_resources(gce.list_volumes, 'name', opts) except KeyboardInterrupt as e: - print "\nExiting on user command." + print("\nExiting on user command.") diff --git a/test/integration/consul_running.py b/test/integration/consul_running.py index 9fdff9ef596..f64aaeecc38 100644 --- a/test/integration/consul_running.py +++ b/test/integration/consul_running.py @@ -6,6 +6,6 @@ if __name__ == '__main__': import consul consul = consul.Consul(host='0.0.0.0', port=8500) consul.catalog.nodes() - print "True" + print("True") except: pass diff --git a/test/integration/setup_gce.py b/test/integration/setup_gce.py index 6ef4f0f0015..8aa8babb2d3 100644 --- a/test/integration/setup_gce.py +++ b/test/integration/setup_gce.py @@ -39,4 +39,4 @@ if __name__ == '__main__': gce.create_volume( size=10, name=prefix+'-extra', location='us-central1-a') except KeyboardInterrupt as e: - print "\nExiting on user command." + print("\nExiting on user command.")