diff --git a/test/integration/targets/get_url/files/testserver.py b/test/integration/targets/get_url/files/testserver.py
index 308426441fe..3a83724ce87 100644
--- a/test/integration/targets/get_url/files/testserver.py
+++ b/test/integration/targets/get_url/files/testserver.py
@@ -1,22 +1,15 @@
from __future__ import annotations
+import http.server
+import socketserver
import sys
if __name__ == '__main__':
- if sys.version_info[0] >= 3:
- import http.server
- import socketserver
- PORT = int(sys.argv[1])
+ PORT = int(sys.argv[1])
- class Handler(http.server.SimpleHTTPRequestHandler):
- pass
+ class Handler(http.server.SimpleHTTPRequestHandler):
+ pass
- Handler.extensions_map['.json'] = 'application/json'
- httpd = socketserver.TCPServer(("", PORT), Handler)
- httpd.serve_forever()
- else:
- import mimetypes
- mimetypes.init()
- mimetypes.add_type('application/json', '.json')
- import SimpleHTTPServer
- SimpleHTTPServer.test()
+ Handler.extensions_map['.json'] = 'application/json'
+ httpd = socketserver.TCPServer(("", PORT), Handler)
+ httpd.serve_forever()
diff --git a/test/integration/targets/module_precedence/lib_no_extension/ping b/test/integration/targets/module_precedence/lib_no_extension/ping
index a28f4699ee7..ab4a9893d69 100644
--- a/test/integration/targets/module_precedence/lib_no_extension/ping
+++ b/test/integration/targets/module_precedence/lib_no_extension/ping
@@ -19,8 +19,7 @@
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see .
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
ANSIBLE_METADATA = {'metadata_version': '1.1',
'status': ['stableinterface'],
diff --git a/test/integration/targets/module_precedence/lib_with_extension/a.ini b/test/integration/targets/module_precedence/lib_with_extension/a.ini
index 80278c9e5c6..4d0fe7bae42 100644
--- a/test/integration/targets/module_precedence/lib_with_extension/a.ini
+++ b/test/integration/targets/module_precedence/lib_with_extension/a.ini
@@ -1,6 +1,5 @@
#!/usr/bin/python
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
import json
diff --git a/test/integration/targets/module_precedence/lib_with_extension/ping.ini b/test/integration/targets/module_precedence/lib_with_extension/ping.ini
index 6f4b6a1a571..b8c9c94c86c 100644
--- a/test/integration/targets/module_precedence/lib_with_extension/ping.ini
+++ b/test/integration/targets/module_precedence/lib_with_extension/ping.ini
@@ -1,6 +1,5 @@
#!/usr/bin/python
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
import json
diff --git a/test/integration/targets/module_precedence/roles_no_extension/foo/library/ping b/test/integration/targets/module_precedence/roles_no_extension/foo/library/ping
index 8860b7aa658..72c3cb8bc0d 100644
--- a/test/integration/targets/module_precedence/roles_no_extension/foo/library/ping
+++ b/test/integration/targets/module_precedence/roles_no_extension/foo/library/ping
@@ -19,8 +19,7 @@
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see .
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
ANSIBLE_METADATA = {'metadata_version': '1.1',
'status': ['stableinterface'],
diff --git a/test/integration/targets/module_precedence/roles_with_extension/foo/library/a.ini b/test/integration/targets/module_precedence/roles_with_extension/foo/library/a.ini
index 8b170291f40..8e3ae41f3b8 100644
--- a/test/integration/targets/module_precedence/roles_with_extension/foo/library/a.ini
+++ b/test/integration/targets/module_precedence/roles_with_extension/foo/library/a.ini
@@ -1,6 +1,5 @@
#!/usr/bin/python
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
import json
diff --git a/test/integration/targets/module_precedence/roles_with_extension/foo/library/ping.ini b/test/integration/targets/module_precedence/roles_with_extension/foo/library/ping.ini
index f9c04f5c690..445ed9d8e62 100644
--- a/test/integration/targets/module_precedence/roles_with_extension/foo/library/ping.ini
+++ b/test/integration/targets/module_precedence/roles_with_extension/foo/library/ping.ini
@@ -1,6 +1,5 @@
#!/usr/bin/python
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
import json
diff --git a/test/integration/targets/setup_rpm_repo/library/create_repo.py b/test/integration/targets/setup_rpm_repo/library/create_repo.py
index 8d880ab9028..8af3711ad86 100644
--- a/test/integration/targets/setup_rpm_repo/library/create_repo.py
+++ b/test/integration/targets/setup_rpm_repo/library/create_repo.py
@@ -2,8 +2,6 @@
from __future__ import annotations
-import subprocess
-import sys
import tempfile
from collections import namedtuple
@@ -67,19 +65,8 @@ def create_repo(arch='x86_64'):
pkgs.append(pkg)
- # HACK: EPEL6 version of rpmfluff can't do multi-arch packaging, so we'll just build separately and copy
- # the noarch stuff in, since we don't currently care about the repodata for noarch
- if sys.version_info[0:2] == (2, 6):
- noarch_repo = YumRepoBuild([p for p in pkgs if 'noarch' in p.get_build_archs()])
- noarch_repo.make('noarch')
-
- repo = YumRepoBuild([p for p in pkgs if arch in p.get_build_archs()])
- repo.make(arch)
-
- subprocess.call("cp {0}/*.rpm {1}".format(noarch_repo.repoDir, repo.repoDir), shell=True)
- else:
- repo = YumRepoBuild(pkgs)
- repo.make(arch, 'noarch')
+ repo = YumRepoBuild(pkgs)
+ repo.make(arch, 'noarch')
for pkg in pkgs:
pkg.clean()
diff --git a/test/integration/targets/uri/files/testserver.py b/test/integration/targets/uri/files/testserver.py
index 308426441fe..3a83724ce87 100644
--- a/test/integration/targets/uri/files/testserver.py
+++ b/test/integration/targets/uri/files/testserver.py
@@ -1,22 +1,15 @@
from __future__ import annotations
+import http.server
+import socketserver
import sys
if __name__ == '__main__':
- if sys.version_info[0] >= 3:
- import http.server
- import socketserver
- PORT = int(sys.argv[1])
+ PORT = int(sys.argv[1])
- class Handler(http.server.SimpleHTTPRequestHandler):
- pass
+ class Handler(http.server.SimpleHTTPRequestHandler):
+ pass
- Handler.extensions_map['.json'] = 'application/json'
- httpd = socketserver.TCPServer(("", PORT), Handler)
- httpd.serve_forever()
- else:
- import mimetypes
- mimetypes.init()
- mimetypes.add_type('application/json', '.json')
- import SimpleHTTPServer
- SimpleHTTPServer.test()
+ Handler.extensions_map['.json'] = 'application/json'
+ httpd = socketserver.TCPServer(("", PORT), Handler)
+ httpd.serve_forever()
diff --git a/test/integration/targets/wait_for/files/testserver.py b/test/integration/targets/wait_for/files/testserver.py
index 8a7e4425fbb..452a04597a2 100644
--- a/test/integration/targets/wait_for/files/testserver.py
+++ b/test/integration/targets/wait_for/files/testserver.py
@@ -1,18 +1,11 @@
from __future__ import annotations
+import http.server
+import socketserver
import sys
if __name__ == '__main__':
- if sys.version_info[0] >= 3:
- import http.server
- import socketserver
- PORT = int(sys.argv[1])
- Handler = http.server.SimpleHTTPRequestHandler
- httpd = socketserver.TCPServer(("", PORT), Handler)
- httpd.serve_forever()
- else:
- import mimetypes
- mimetypes.init()
- mimetypes.add_type('application/json', '.json')
- import SimpleHTTPServer
- SimpleHTTPServer.test()
+ PORT = int(sys.argv[1])
+ Handler = http.server.SimpleHTTPRequestHandler
+ httpd = socketserver.TCPServer(("", PORT), Handler)
+ httpd.serve_forever()