remove builtins in favor of six

Author: Elias Nygren

test/conftest.py

@@ -2,7 +2,6 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
-from builtins import object, open
 import json
 import os
 import pytest

test/test_server.py

@@ -2,7 +2,6 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
-from builtins import str
 
 from conftest import Mock
 import pytest

test/test_storage.py

@@ -2,7 +2,6 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
-from builtins import object
 
 from conftest import Mock
 import responses

test/test_tags.py

@@ -2,7 +2,8 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
-from builtins import list, str, dict
+
+import six
 
 from upcloud_api import Tag
 
@@ -21,10 +22,10 @@ def tag_post_callback(request):
     if 'servers' in request_body['tag']:
         assert isinstance(request_body['tag']['servers'], dict)
         assert isinstance(request_body['tag']['servers']['server'], list)
-        assert isinstance(request_body['tag']['servers']['server'][0], str)
+        assert isinstance(request_body['tag']['servers']['server'][0], six.string_types)
 
     if 'description' in request_body['tag']:
-        assert isinstance(request_body['tag']['description'], str)
+        assert isinstance(request_body['tag']['description'], six.string_types)
 
     return(201, {}, json.dumps(request_body))
 

upcloud_api/cloud_manager/ip_address_mixin.py

@@ -2,7 +2,8 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
-from builtins import str
+
+import six
 
 from upcloud_api import IP_address
 
@@ -33,7 +34,7 @@ def attach_IP(self, server, family='IPv4'):
         """
         Attach a new (random) IP_address to the given server (object or UUID).
         """
-        if not isinstance(server, str):
+        if not isinstance(server, six.string_types):
             server = server.uuid
 
         body = {
@@ -52,7 +53,7 @@ def modify_IP(self, IP_addr, ptr_record):
 
         Accepts an IP_address instance (object) or its address (string).
         """
-        if not isinstance(IP_addr, str):
+        if not isinstance(IP_addr, six.string_types):
             IP_addr = IP_addr.address
 
         body = {
@@ -70,7 +71,7 @@ def release_IP(self, IP_addr):
 
         Accepts an IP_address instance (object) or its address (string).
         """
-        if not isinstance(IP_addr, str):
+        if not isinstance(IP_addr, six.string_types):
             IP_addr = IP_addr.address
 
         return self.request('DELETE', '/ip_address/' + IP_addr)

upcloud_api/cloud_manager/server_mixin.py

@@ -2,7 +2,6 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
-from builtins import str
 
 from upcloud_api import IP_address, Server, Storage
 from upcloud_api.tools import assignIfExists

upcloud_api/cloud_manager/tag_mixin.py

@@ -2,7 +2,9 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
-from builtins import str
+
+import six
+
 from upcloud_api import Tag
 
 
@@ -80,7 +82,7 @@ def remove_tags(self, server, tags):
 
     def delete_tag(self, tag):
         """Delete the Tag. Returns and empty object."""
-        if not isinstance(tag, str):
+        if not isinstance(tag, six.string_types):
             tag = tag.name
 
         return self.request('DELETE', '/tag/' + tag)

upcloud_api/server.py

@@ -1,7 +1,5 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
-from builtins import dict
-from builtins import str
 from time import sleep
 
 from upcloud_api import Storage, IP_address

upcloud_api/storage.py

@@ -2,7 +2,6 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import absolute_import
-from builtins import dict, object, str
 
 from upcloud_api.tools import assignIfExists, OperatingSystems
 

upcloud_api/tag.py

@@ -1,6 +1,7 @@
 from __future__ import unicode_literals
 from __future__ import absolute_import
-from builtins import dict, str
+
+import six
 
 from upcloud_api import Server
 
@@ -42,7 +43,7 @@ def __reset(self, **kwargs):
             servers = kwargs['servers']
 
         # convert UUIDs into server objects
-        if servers and isinstance(servers[0], str):
+        if servers and isinstance(servers[0], six.string_types):
             kwargs['servers'] = [Server(uuid=server, populated=False) for server in servers]
         else:
             kwargs['servers'] = servers