Run pyupgrade and flynt

Author: akx

test/conftest.py

@@ -1,7 +1,3 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
 import json
 import os
 import pytest
@@ -27,11 +23,11 @@ def manager():
 def read_from_file(filename):
     filename = filename.replace("/", "_")
     cwd = os.path.dirname(__file__)
-    f = open(cwd + '/json_data/'+filename, 'r')
+    f = open(cwd + '/json_data/'+filename)
     return f.read()
 
 
-class Mock(object):
+class Mock:
     base_url = 'https://api.upcloud.com/1.3'
 
     @staticmethod

test/helpers/infra.py

@@ -1,8 +1,3 @@
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
 from upcloud_api import CloudManager, Storage, FirewallRule, Tag, IPAddress
 from upcloud_api.server import Server, login_user_block
 

test/helpers/infra_helpers.py

@@ -1,8 +1,3 @@
-from __future__ import print_function
-from __future__ import unicode_literals
-from __future__ import division
-from __future__ import absolute_import
-
 from upcloud_api import Tag
 
 

test/test_apidoc/test_10_ip_addresses.py

@@ -1,15 +1,9 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
-
 from upcloud_api import IPAddress, Server
 from conftest import Mock, read_from_file
 import json
 import responses
 
-class TestIP(object):
+class TestIP:
 
     def test_ip_in_server_creation(self):
         """IPAddress in server creation.
@@ -36,7 +30,7 @@ def test_ip_in_server_details(self):
         data = read_from_file('server_00798b85-efdc-41ca-8021-f6ef457b8531.json')
         s = Server(**json.loads(data))
         for ip in s.ip_addresses:
-            assert set(ip.to_dict().keys()) == set(['address', 'family', 'access'])
+            assert set(ip.to_dict().keys()) == {'address', 'family', 'access'}
 
     def test_ip_details(self):
         """IPAdress LIST/GET.

test/test_cloud_manager.py

@@ -1,14 +1,9 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
 from conftest import Mock
 import json
 import responses
 
 
-class TestCloudManagerBasic(object):
+class TestCloudManagerBasic:
     @responses.activate
     def test_get_account(self, manager):
         data = Mock.mock_get("account")

test/test_firewall.py

@@ -1,8 +1,3 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
 from upcloud_api import FirewallRule
 
 from conftest import Mock
@@ -30,7 +25,7 @@ def check_fields(body):
         """
         for field in required_fields:
             if field not in request_body['firewall_rule']:
-                raise Exception('missing required field: {0}. Body was:{1}'.format(field, request_body))
+                raise Exception(f'missing required field: {field}. Body was:{request_body}')
 
     if isinstance(request_body, list):
         for body in request_body:
@@ -42,7 +37,7 @@ def check_fields(body):
 
 
 
-class TestFirewall(object):
+class TestFirewall:
     @responses.activate
     def test_add_firewall_rule(self, manager):
         Mock.mock_get('server/00798b85-efdc-41ca-8021-f6ef457b8531')

test/test_host.py

@@ -1,13 +1,8 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
 from conftest import Mock
 import responses
 
 
-class TestHost(object):
+class TestHost:
     @responses.activate
     def test_get_hosts(self, manager):
         data = Mock.mock_get('host')

test/test_integration/test_integration_test.py

@@ -1,7 +1,3 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
 import os
 import pytest
 import multiprocessing
@@ -52,11 +48,11 @@ def teardown_module(module):
         pool.map(destroy_server, manager.get_servers())
         pool.map(delete_tag, manager.get_tags())
     else:
-        print('removing {0}'.format(CREATED_SERVERS))
+        print(f'removing {CREATED_SERVERS}')
         for server in CREATED_SERVERS:
             server.stop_and_destroy()
 
-        print('removing {0}'.format(CREATED_TAGS))
+        print(f'removing {CREATED_TAGS}')
         for tag in CREATED_TAGS:
             manager.delete_tag(tag)
 
@@ -97,7 +93,7 @@ def test_infra_ops():
                 found = True
 
         if not found:
-            raise Exception('server {0} not found in all_servers'.format(cs.uuid))
+            raise Exception(f'server {cs.uuid} not found in all_servers')
 
     # assert servers' states
     # TODO(elnygren): add more assertions here

test/test_ip_manager.py

@@ -1,12 +1,7 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
 from conftest import Mock
 import responses
 
-class TestIP(object):
+class TestIP:
     @responses.activate
     def test_get_ip(self, manager):
         data = Mock.mock_get('ip_address/10.1.0.101')

test/test_network.py

@@ -1,13 +1,8 @@
-from __future__ import unicode_literals
-from __future__ import print_function
-from __future__ import division
-from __future__ import absolute_import
-
 from conftest import Mock
 import responses
 
 
-class TestNetwork(object):
+class TestNetwork:
     @responses.activate
     def test_get_networks(self, manager):
         data = Mock.mock_get('network')