Python code modernization, 1/n (#1141)

* Remove unicode text prefixes.

* Replace str.format() uses with f-strings.

* Replace % with f-strings, and do some cleanup.

* Fix wrong variable.

* Avoid unnecessary string conversion.

tests/unit/plugins/module_utils/_api/utils/test_build.py

@@ -431,9 +431,7 @@ class TarTest(unittest.TestCase):
         with pytest.raises(IOError) as ei:
             tar(base)
 
-        assert 'Can not read file in context: {full_path}'.format(full_path=full_path) in (
-            ei.exconly()
-        )
+        assert f'Can not read file in context: {full_path}' in ei.exconly()
 
     @pytest.mark.skipif(IS_WINDOWS_PLATFORM, reason='No symlinks on Windows')
     def test_tar_with_file_symlinks(self):

tests/unit/plugins/module_utils/_api/utils/test_json_stream.py

@@ -33,12 +33,12 @@ class TestStreamAsText:
     def test_stream_with_non_utf_unicode_character(self):
         stream = [b'\xed\xf3\xf3']
         output, = stream_as_text(stream)
-        assert output == u'���'
+        assert output == '���'
 
     def test_stream_with_utf_character(self):
-        stream = [u'ěĝ'.encode('utf-8')]
+        stream = ['ěĝ'.encode('utf-8')]
         output, = stream_as_text(stream)
-        assert output == u'ěĝ'
+        assert output == 'ěĝ'
 
 
 class TestJsonStream:

tests/unit/plugins/module_utils/_api/utils/test_proxy.py

@@ -75,7 +75,7 @@ class ProxyConfigTest(unittest.TestCase):
         # Proxy config is non null, env is None.
         self.assertSetEqual(
             set(CONFIG.inject_proxy_environment(None)),
-            set('{k}={v}'.format(k=k, v=v) for k, v in ENV.items()))
+            set(f'{k}={v}' for k, v in ENV.items()))
 
         # Proxy config is null, env is None.
         self.assertIsNone(ProxyConfig().inject_proxy_environment(None), None)
@@ -84,7 +84,7 @@ class ProxyConfigTest(unittest.TestCase):
 
         # Proxy config is non null, env is non null
         actual = CONFIG.inject_proxy_environment(env)
-        expected = ['{k}={v}'.format(k=k, v=v) for k, v in ENV.items()] + env
+        expected = [f'{k}={v}' for k, v in ENV.items()] + env
         # It's important that the first 8 variables are the ones from the proxy
         # config, and the last 2 are the ones from the input environment
         self.assertSetEqual(set(actual[:8]), set(expected[:8]))

tests/unit/plugins/module_utils/_api/utils/test_utils.py

@@ -176,23 +176,23 @@ class ConverVolumeBindsTest(unittest.TestCase):
         assert convert_volume_binds(data) == ['/mnt/vol1:/data:rw']
 
     def test_convert_volume_binds_unicode_bytes_input(self):
-        expected = [u'/mnt/지연:/unicode/박:rw']
+        expected = ['/mnt/지연:/unicode/박:rw']
 
         data = {
-            u'/mnt/지연'.encode('utf-8'): {
-                'bind': u'/unicode/박'.encode('utf-8'),
-                'mode': u'rw'
+            '/mnt/지연'.encode('utf-8'): {
+                'bind': '/unicode/박'.encode('utf-8'),
+                'mode': 'rw'
             }
         }
         assert convert_volume_binds(data) == expected
 
     def test_convert_volume_binds_unicode_unicode_input(self):
-        expected = [u'/mnt/지연:/unicode/박:rw']
+        expected = ['/mnt/지연:/unicode/박:rw']
 
         data = {
-            u'/mnt/지연': {
-                'bind': u'/unicode/박',
-                'mode': u'rw'
+            '/mnt/지연': {
+                'bind': '/unicode/박',
+                'mode': 'rw'
             }
         }
         assert convert_volume_binds(data) == expected
@@ -288,7 +288,7 @@ class ParseHostTest(unittest.TestCase):
         }
 
         for host in invalid_hosts:
-            msg = 'Should have failed to parse invalid host: {0}'.format(host)
+            msg = f'Should have failed to parse invalid host: {host}'
             with self.assertRaises(DockerException, msg=msg):
                 parse_host(host, None)
 
@@ -296,7 +296,7 @@ class ParseHostTest(unittest.TestCase):
             self.assertEqual(
                 parse_host(host, None),
                 expected,
-                msg='Failed to parse valid host: {0}'.format(host),
+                msg=f'Failed to parse valid host: {host}',
             )
 
     def test_parse_host_empty_value(self):
@@ -347,14 +347,14 @@ class ParseRepositoryTagTest(unittest.TestCase):
         )
 
     def test_index_image_sha(self):
-        assert parse_repository_tag("root@sha256:{sha}".format(sha=self.sha)) == (
-            "root", "sha256:{sha}".format(sha=self.sha)
+        assert parse_repository_tag(f"root@sha256:{self.sha}") == (
+            "root", f"sha256:{self.sha}"
         )
 
     def test_private_reg_image_sha(self):
         assert parse_repository_tag(
-            "url:5000/repo@sha256:{sha}".format(sha=self.sha)
-        ) == ("url:5000/repo", "sha256:{sha}".format(sha=self.sha))
+            f"url:5000/repo@sha256:{self.sha}"
+        ) == ("url:5000/repo", f"sha256:{self.sha}")
 
 
 class ParseDeviceTest(unittest.TestCase):
@@ -457,7 +457,7 @@ class UtilsTest(unittest.TestCase):
 
 class SplitCommandTest(unittest.TestCase):
     def test_split_command_with_unicode(self):
-        assert split_command(u'echo μμ') == ['echo', 'μμ']
+        assert split_command('echo μμ') == ['echo', 'μμ']
 
 
 class FormatEnvironmentTest(unittest.TestCase):
@@ -465,7 +465,7 @@ class FormatEnvironmentTest(unittest.TestCase):
         env_dict = {
             'ARTIST_NAME': b'\xec\x86\xa1\xec\xa7\x80\xec\x9d\x80'
         }
-        assert format_environment(env_dict) == [u'ARTIST_NAME=송지은']
+        assert format_environment(env_dict) == ['ARTIST_NAME=송지은']
 
     def test_format_env_no_value(self):
         env_dict = {