From 15dd3b3e0fca73f740b3f8db49605785f0941ddb Mon Sep 17 00:00:00 2001 From: "Benjamin R. J. Schwedler" Date: Wed, 12 Oct 2016 16:53:58 -0500 Subject: [PATCH] Prepare for python3 compatibility Apply several smaller sets of changes grouped into complexity by the stages of the 'futurize' tool. Futurize was not applied wholesale, as not all changes introduced are required when using python 2.7 'Safe' fixes for python3 compatibility: stage1 of futurize - Update exceptions to use python3 syntax - Replace deprecated unittest methods - Provide python3 compatibility for newstyle classes Fixes removing backward compatability before python 2.7 - Convert map func to list comprehension - Add compatibilty for range - Add compatibility for future str builtins - Use urllib from standard lib for python3 compat - Replace __builtin__.__import__ with __import__ in unittests Update requirements.txt - Add requirement for future module for python2 - Remove requirements provided by upstream packages --- requirements.txt | 32 ++++--------------- .../clc_ansible_module/clc_aa_policy.py | 7 ++-- .../clc_ansible_module/clc_alert_policy.py | 3 +- .../clc_blueprint_package.py | 3 +- .../clc_ansible_module/clc_firewall_policy.py | 9 ++++-- .../python/clc_ansible_module/clc_group.py | 5 +-- .../clc_ansible_module/clc_group_fact.py | 4 ++- .../clc_ansible_module/clc_loadbalancer.py | 3 +- .../clc_loadbalancer_fact.py | 3 +- .../clc_ansible_module/clc_modify_server.py | 3 +- .../python/clc_ansible_module/clc_network.py | 3 +- .../clc_ansible_module/clc_network_fact.py | 3 +- .../python/clc_ansible_module/clc_publicip.py | 5 +-- .../python/clc_ansible_module/clc_server.py | 5 +-- .../clc_ansible_module/clc_server_fact.py | 4 ++- .../clc_ansible_module/clc_server_snapshot.py | 3 +- src/main/python/clc_inv.py | 1 + src/unittest/python/test_clc_aa_policy.py | 9 ++---- src/unittest/python/test_clc_alert_policy.py | 9 ++---- .../python/test_clc_blueprint_package.py | 9 ++---- .../python/test_clc_firewall_policy.py | 9 ++---- src/unittest/python/test_clc_group.py | 9 ++---- src/unittest/python/test_clc_inv.py | 4 +-- src/unittest/python/test_clc_loadbalancer.py | 9 ++---- src/unittest/python/test_clc_modify_server.py | 9 ++---- src/unittest/python/test_clc_network.py | 9 ++---- src/unittest/python/test_clc_publicip.py | 9 ++---- src/unittest/python/test_clc_server.py | 9 ++---- .../python/test_clc_server_snapshot.py | 9 ++---- 29 files changed, 84 insertions(+), 115 deletions(-) diff --git a/requirements.txt b/requirements.txt index e0a0477..26a5268 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,27 +1,9 @@ ansible==2.0.2.0 -args==0.1.0 -cffi==1.6.0 clc-sdk==2.44 -clint==0.5.1 -coverage==4.0.3 -cryptography==1.3.1 -enum34==1.1.4 -funcsigs==1.0.2 -idna==2.1 -ipaddress==1.0.16 -Jinja2==2.8 -MarkupSafe==0.23 -mock==2.0.0 -nose==1.3.7 -paramiko==2.0.0 -pbr==1.9.1 -prettytable==0.7.2 -pyasn1==0.1.9 -PyBuilder==0.10.63 -pycparser==2.14 -pycrypto==2.6.1 -PyYAML==3.11 -requests==2.10.0 -six==1.10.0 -wheel==0.24.0 -xmlrunner==1.7.7 +future +mock +nose +PyBuilder +requests>=2.7 +setuptools +wheel diff --git a/src/main/python/clc_ansible_module/clc_aa_policy.py b/src/main/python/clc_ansible_module/clc_aa_policy.py index 4833ffb..a67c939 100644 --- a/src/main/python/clc_ansible_module/clc_aa_policy.py +++ b/src/main/python/clc_ansible_module/clc_aa_policy.py @@ -142,6 +142,7 @@ __version__ = '${version}' +from builtins import object from distutils.version import LooseVersion try: @@ -165,7 +166,7 @@ CLC_FOUND = True -class ClcAntiAffinityPolicy: +class ClcAntiAffinityPolicy(object): clc = clc_sdk module = None @@ -278,7 +279,7 @@ def _create_policy(self, p): return self.clc.v2.AntiAffinity.Create( name=p['name'], location=p['location']) - except CLCException, ex: + except CLCException as ex: self.module.fail_json(msg='Failed to create anti affinity policy : {0}. {1}'.format( p['name'], ex.response_text )) @@ -292,7 +293,7 @@ def _delete_policy(self, p): try: policy = self.policy_dict[p['name']] policy.Delete() - except CLCException, ex: + except CLCException as ex: self.module.fail_json(msg='Failed to delete anti affinity policy : {0}. {1}'.format( p['name'], ex.response_text )) diff --git a/src/main/python/clc_ansible_module/clc_alert_policy.py b/src/main/python/clc_ansible_module/clc_alert_policy.py index 641aa34..71c28d7 100644 --- a/src/main/python/clc_ansible_module/clc_alert_policy.py +++ b/src/main/python/clc_ansible_module/clc_alert_policy.py @@ -185,6 +185,7 @@ __version__ = '${version}' +from builtins import object, str from distutils.version import LooseVersion try: @@ -208,7 +209,7 @@ CLC_FOUND = True -class ClcAlertPolicy: +class ClcAlertPolicy(object): clc = clc_sdk module = None diff --git a/src/main/python/clc_ansible_module/clc_blueprint_package.py b/src/main/python/clc_ansible_module/clc_blueprint_package.py index 456e06d..64c7b79 100644 --- a/src/main/python/clc_ansible_module/clc_blueprint_package.py +++ b/src/main/python/clc_ansible_module/clc_blueprint_package.py @@ -106,6 +106,7 @@ __version__ = '${version}' +from builtins import object from distutils.version import LooseVersion try: @@ -129,7 +130,7 @@ CLC_FOUND = True -class ClcBlueprintPackage: +class ClcBlueprintPackage(object): clc = clc_sdk module = None diff --git a/src/main/python/clc_ansible_module/clc_firewall_policy.py b/src/main/python/clc_ansible_module/clc_firewall_policy.py index e875bb9..d39fbdb 100644 --- a/src/main/python/clc_ansible_module/clc_firewall_policy.py +++ b/src/main/python/clc_ansible_module/clc_firewall_policy.py @@ -185,8 +185,11 @@ __version__ = '${version}' -import urlparse +from future import standard_library +standard_library.install_aliases() +import urllib.parse from time import sleep +from builtins import object, str from distutils.version import LooseVersion try: @@ -207,7 +210,7 @@ CLC_FOUND = True -class ClcFirewallPolicy: +class ClcFirewallPolicy(object): clc = None @@ -306,7 +309,7 @@ def _get_policy_id_from_response(response): :return: policy_id: firewall policy id from creation call """ url = response.get('links')[0]['href'] - path = urlparse.urlparse(url).path + path = urllib.parse.urlparse(url).path path_list = os.path.split(path) policy_id = path_list[-1] return policy_id diff --git a/src/main/python/clc_ansible_module/clc_group.py b/src/main/python/clc_ansible_module/clc_group.py index 50e4deb..d67bef6 100644 --- a/src/main/python/clc_ansible_module/clc_group.py +++ b/src/main/python/clc_ansible_module/clc_group.py @@ -224,6 +224,7 @@ __version__ = '${version}' +from builtins import object, str from distutils.version import LooseVersion try: @@ -374,7 +375,7 @@ def _delete_group(self, group_name): group, parent = self.group_dict.get(group_name) try: response = group.Delete() - except CLCException, ex: + except CLCException as ex: self.module.fail_json(msg='Failed to delete group :{0}. {1}'.format( group_name, ex.response_text )) @@ -435,7 +436,7 @@ def _create_group(self, group, parent, description): (parent, grandparent) = self.group_dict[parent] try: response = parent.Create(name=group, description=description) - except CLCException, ex: + except CLCException as ex: self.module.fail_json(msg='Failed to create group :{0}. {1}'.format( group, ex.response_text)) return response diff --git a/src/main/python/clc_ansible_module/clc_group_fact.py b/src/main/python/clc_ansible_module/clc_group_fact.py index 0468b32..eff461e 100644 --- a/src/main/python/clc_ansible_module/clc_group_fact.py +++ b/src/main/python/clc_ansible_module/clc_group_fact.py @@ -192,6 +192,8 @@ __version__ = '${version}' +from builtins import object + try: import requests except ImportError: @@ -200,7 +202,7 @@ REQUESTS_FOUND = True -class ClcGroupFact: +class ClcGroupFact(object): def __init__(self, module): """ diff --git a/src/main/python/clc_ansible_module/clc_loadbalancer.py b/src/main/python/clc_ansible_module/clc_loadbalancer.py index 2c99735..b0e9ff4 100644 --- a/src/main/python/clc_ansible_module/clc_loadbalancer.py +++ b/src/main/python/clc_ansible_module/clc_loadbalancer.py @@ -225,6 +225,7 @@ __version__ = '${version}' from time import sleep +from builtins import object, str from distutils.version import LooseVersion try: @@ -248,7 +249,7 @@ CLC_FOUND = True -class ClcLoadBalancer: +class ClcLoadBalancer(object): clc = None diff --git a/src/main/python/clc_ansible_module/clc_loadbalancer_fact.py b/src/main/python/clc_ansible_module/clc_loadbalancer_fact.py index 8dbc3f0..b0013dd 100644 --- a/src/main/python/clc_ansible_module/clc_loadbalancer_fact.py +++ b/src/main/python/clc_ansible_module/clc_loadbalancer_fact.py @@ -151,6 +151,7 @@ __version__ = '{version}' +from builtins import object, str from distutils.version import LooseVersion try: @@ -170,7 +171,7 @@ CLC_FOUND = True -class ClcLoadbalancerFact: +class ClcLoadbalancerFact(object): def __init__(self, module): """ diff --git a/src/main/python/clc_ansible_module/clc_modify_server.py b/src/main/python/clc_ansible_module/clc_modify_server.py index c4f0014..f188a7c 100644 --- a/src/main/python/clc_ansible_module/clc_modify_server.py +++ b/src/main/python/clc_ansible_module/clc_modify_server.py @@ -358,6 +358,7 @@ __version__ = '${version}' +from builtins import object, str from distutils.version import LooseVersion try: @@ -382,7 +383,7 @@ CLC_FOUND = True -class ClcModifyServer: +class ClcModifyServer(object): clc = clc_sdk def __init__(self, module): diff --git a/src/main/python/clc_ansible_module/clc_network.py b/src/main/python/clc_ansible_module/clc_network.py index 958cd94..04c2aa7 100644 --- a/src/main/python/clc_ansible_module/clc_network.py +++ b/src/main/python/clc_ansible_module/clc_network.py @@ -161,6 +161,7 @@ __version__ = '${version}' +from builtins import object from distutils.version import LooseVersion try: @@ -184,7 +185,7 @@ CLC_FOUND = True -class ClcNetwork: +class ClcNetwork(object): clc = clc_sdk module = None diff --git a/src/main/python/clc_ansible_module/clc_network_fact.py b/src/main/python/clc_ansible_module/clc_network_fact.py index 3e33278..6d6997a 100644 --- a/src/main/python/clc_ansible_module/clc_network_fact.py +++ b/src/main/python/clc_ansible_module/clc_network_fact.py @@ -120,6 +120,7 @@ __version__ = '{version}' +from builtins import object from distutils.version import LooseVersion try: @@ -139,7 +140,7 @@ CLC_FOUND = True -class ClcNetworkFact: +class ClcNetworkFact(object): def __init__(self, module): """ diff --git a/src/main/python/clc_ansible_module/clc_publicip.py b/src/main/python/clc_ansible_module/clc_publicip.py index dd46ef9..f80de5e 100644 --- a/src/main/python/clc_ansible_module/clc_publicip.py +++ b/src/main/python/clc_ansible_module/clc_publicip.py @@ -142,6 +142,7 @@ __version__ = '${version}' +from builtins import object from distutils.version import LooseVersion try: @@ -272,7 +273,7 @@ def _add_publicip_to_server(self, server, ports_to_expose, source_restrictions=N result = None try: result = server.PublicIPs().Add(ports=ports_to_expose, source_restrictions=source_restrictions) - except CLCException, ex: + except CLCException as ex: self.module.fail_json(msg='Failed to add public ip to the server : {0}. {1}'.format( server.id, ex.response_text )) @@ -309,7 +310,7 @@ def _remove_publicip_from_server(self, server): try: for ip_address in server.PublicIPs().public_ips: result = ip_address.Delete() - except CLCException, ex: + except CLCException as ex: self.module.fail_json(msg='Failed to remove public ip from the server : {0}. {1}'.format( server.id, ex.response_text )) diff --git a/src/main/python/clc_ansible_module/clc_server.py b/src/main/python/clc_ansible_module/clc_server.py index 0c5c5d4..e475c1d 100644 --- a/src/main/python/clc_ansible_module/clc_server.py +++ b/src/main/python/clc_ansible_module/clc_server.py @@ -514,6 +514,7 @@ __version__ = '${version}' from time import sleep +from builtins import object, range, str from distutils.version import LooseVersion try: @@ -538,7 +539,7 @@ CLC_FOUND = True -class ClcServer: +class ClcServer(object): clc = clc_sdk def __init__(self, module): @@ -634,7 +635,7 @@ def process_request(self): group = ClcServer._find_group(module=self.module, datacenter=datacenter, lookup_group=p.get('group')) servers = group.Servers().Servers() group = group.data - group['servers'] = map(lambda s: s.id, servers) + group['servers'] = [s.id for s in servers] self.module.exit_json( changed=changed, diff --git a/src/main/python/clc_ansible_module/clc_server_fact.py b/src/main/python/clc_ansible_module/clc_server_fact.py index f34af03..faabcf7 100644 --- a/src/main/python/clc_ansible_module/clc_server_fact.py +++ b/src/main/python/clc_ansible_module/clc_server_fact.py @@ -241,6 +241,8 @@ __version__ = '${version}' +from builtins import object + try: import requests except ImportError: @@ -249,7 +251,7 @@ REQUESTS_FOUND = True -class ClcServerFact: +class ClcServerFact(object): def __init__(self, module): """ diff --git a/src/main/python/clc_ansible_module/clc_server_snapshot.py b/src/main/python/clc_ansible_module/clc_server_snapshot.py index ce7d605..211a4af 100644 --- a/src/main/python/clc_ansible_module/clc_server_snapshot.py +++ b/src/main/python/clc_ansible_module/clc_server_snapshot.py @@ -125,6 +125,7 @@ __version__ = '${version}' +from builtins import object from distutils.version import LooseVersion try: @@ -148,7 +149,7 @@ CLC_FOUND = True -class ClcSnapshot: +class ClcSnapshot(object): clc = clc_sdk module = None diff --git a/src/main/python/clc_inv.py b/src/main/python/clc_inv.py index e138ed7..7712b69 100755 --- a/src/main/python/clc_inv.py +++ b/src/main/python/clc_inv.py @@ -46,6 +46,7 @@ from multiprocessing import Pool import itertools import json +from builtins import str import clc from clc import CLCException, APIFailedResponse diff --git a/src/unittest/python/test_clc_aa_policy.py b/src/unittest/python/test_clc_aa_policy.py index 8c5733d..f84e36d 100755 --- a/src/unittest/python/test_clc_aa_policy.py +++ b/src/unittest/python/test_clc_aa_policy.py @@ -171,8 +171,7 @@ def test_set_clc_credentials_w_no_creds(self): def test_clc_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'clc': raise ImportError return real_import(name, *args) @@ -186,8 +185,7 @@ def mock_import(name, *args): def test_requests_invalid_version(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.4.0' @@ -202,8 +200,7 @@ def mock_import(name, *args): def test_requests_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.7.0' diff --git a/src/unittest/python/test_clc_alert_policy.py b/src/unittest/python/test_clc_alert_policy.py index 3975d1c..c2f7eef 100644 --- a/src/unittest/python/test_clc_alert_policy.py +++ b/src/unittest/python/test_clc_alert_policy.py @@ -96,8 +96,7 @@ def test_set_clc_credentials_w_no_creds(self): def test_clc_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'clc': raise ImportError return real_import(name, *args) @@ -111,8 +110,7 @@ def mock_import(name, *args): def test_requests_invalid_version(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.4.0' @@ -127,8 +125,7 @@ def mock_import(name, *args): def test_requests_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.7.0' diff --git a/src/unittest/python/test_clc_blueprint_package.py b/src/unittest/python/test_clc_blueprint_package.py index 749027a..7eb3b56 100755 --- a/src/unittest/python/test_clc_blueprint_package.py +++ b/src/unittest/python/test_clc_blueprint_package.py @@ -111,8 +111,7 @@ def test_set_clc_credentials_w_api_url(self, mock_clc_sdk): def test_clc_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'clc': raise ImportError return real_import(name, *args) @@ -126,8 +125,7 @@ def mock_import(name, *args): def test_requests_invalid_version(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.4.0' @@ -142,8 +140,7 @@ def mock_import(name, *args): def test_requests_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.7.0' diff --git a/src/unittest/python/test_clc_firewall_policy.py b/src/unittest/python/test_clc_firewall_policy.py index 6db3eed..7c2dcdd 100644 --- a/src/unittest/python/test_clc_firewall_policy.py +++ b/src/unittest/python/test_clc_firewall_policy.py @@ -42,8 +42,7 @@ def test_clc_set_credentials_w_creds(self): def test_clc_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'clc': raise ImportError return real_import(name, *args) @@ -57,8 +56,7 @@ def mock_import(name, *args): def test_requests_invalid_version(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.4.0' @@ -73,8 +71,7 @@ def mock_import(name, *args): def test_requests_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.7.0' diff --git a/src/unittest/python/test_clc_group.py b/src/unittest/python/test_clc_group.py index 4a3a75d..f52e415 100755 --- a/src/unittest/python/test_clc_group.py +++ b/src/unittest/python/test_clc_group.py @@ -42,8 +42,7 @@ def build_mock_request_list(self, mock_server_list=None, status='succeeded'): def test_clc_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'clc': @@ -62,8 +61,7 @@ def mock_import(name, *args): def test_requests_invalid_version(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.4.0' @@ -80,8 +78,7 @@ def mock_import(name, *args): def test_requests_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.7.0' diff --git a/src/unittest/python/test_clc_inv.py b/src/unittest/python/test_clc_inv.py index 5fc69f3..054349d 100644 --- a/src/unittest/python/test_clc_inv.py +++ b/src/unittest/python/test_clc_inv.py @@ -142,8 +142,8 @@ def test_add_windows_hostvars(self, mock_clc_sdk, mock_add_windows_hostvars): mock_clc_sdk.v2.Server.return_value = server result = clc_inv._add_windows_hostvars(hostvars, server) - self.assertEquals(result[server.name]['ansible_ssh_port'], 5986) - self.assertEquals(result[server.name]['ansible_connection'], 'winrm') + self.assertEqual(result[server.name]['ansible_ssh_port'], 5986) + self.assertEqual(result[server.name]['ansible_connection'], 'winrm') @patch('clc_inv._add_windows_hostvars') @patch('clc_inv.clc') diff --git a/src/unittest/python/test_clc_loadbalancer.py b/src/unittest/python/test_clc_loadbalancer.py index 8ad3b91..fb1ff2f 100755 --- a/src/unittest/python/test_clc_loadbalancer.py +++ b/src/unittest/python/test_clc_loadbalancer.py @@ -29,8 +29,7 @@ def setUp(self): def test_clc_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'clc': @@ -49,8 +48,7 @@ def mock_import(name, *args): def test_requests_invalid_version(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.4.0' @@ -67,8 +65,7 @@ def mock_import(name, *args): def test_requests_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.7.0' diff --git a/src/unittest/python/test_clc_modify_server.py b/src/unittest/python/test_clc_modify_server.py index 0b8214f..5f8654b 100755 --- a/src/unittest/python/test_clc_modify_server.py +++ b/src/unittest/python/test_clc_modify_server.py @@ -36,8 +36,7 @@ def setUp(self): def test_clc_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'clc': raise ImportError return real_import(name, *args) @@ -53,8 +52,7 @@ def mock_import(name, *args): def test_requests_invalid_version(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.4.0' @@ -71,8 +69,7 @@ def mock_import(name, *args): def test_requests_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.7.0' diff --git a/src/unittest/python/test_clc_network.py b/src/unittest/python/test_clc_network.py index cca6da1..7c0d9c1 100755 --- a/src/unittest/python/test_clc_network.py +++ b/src/unittest/python/test_clc_network.py @@ -100,8 +100,7 @@ def test_set_clc_credentials_w_no_creds(self): def test_clc_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'clc': raise ImportError return real_import(name, *args) @@ -115,8 +114,7 @@ def mock_import(name, *args): def test_requests_invalid_version(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.4.0' @@ -131,8 +129,7 @@ def mock_import(name, *args): def test_requests_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.7.0' diff --git a/src/unittest/python/test_clc_publicip.py b/src/unittest/python/test_clc_publicip.py index 4ef6d31..9c98b88 100755 --- a/src/unittest/python/test_clc_publicip.py +++ b/src/unittest/python/test_clc_publicip.py @@ -112,8 +112,7 @@ def build_mock_server_id_list(self): def test_clc_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'clc': raise ImportError return real_import(name, *args) @@ -128,8 +127,7 @@ def mock_import(name, *args): def test_requests_invalid_version(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.4.0' @@ -144,8 +142,7 @@ def mock_import(name, *args): def test_requests_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.7.0' diff --git a/src/unittest/python/test_clc_server.py b/src/unittest/python/test_clc_server.py index 9dc4663..90ba3b1 100755 --- a/src/unittest/python/test_clc_server.py +++ b/src/unittest/python/test_clc_server.py @@ -35,8 +35,7 @@ def setUp(self): def test_clc_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'clc': raise ImportError return real_import(name, *args) @@ -52,8 +51,7 @@ def mock_import(name, *args): def test_requests_invalid_version(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.4.0' @@ -70,8 +68,7 @@ def mock_import(name, *args): def test_requests_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.7.0' diff --git a/src/unittest/python/test_clc_server_snapshot.py b/src/unittest/python/test_clc_server_snapshot.py index b90633c..cc746a2 100644 --- a/src/unittest/python/test_clc_server_snapshot.py +++ b/src/unittest/python/test_clc_server_snapshot.py @@ -32,8 +32,7 @@ def setUp(self): def test_clc_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'clc': raise ImportError return real_import(name, *args) @@ -49,8 +48,7 @@ def mock_import(name, *args): def test_requests_invalid_version(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.4.0' @@ -67,8 +65,7 @@ def mock_import(name, *args): def test_requests_module_not_found(self): # Setup Mock Import Function - import __builtin__ as builtins - real_import = builtins.__import__ + real_import = __import__ def mock_import(name, *args): if name == 'requests': args[0]['requests'].__version__ = '2.7.0'