Remove obsolete compat code from integration tests (#81961)

Also fix up boilerplate for non .py extension files that contain Python code.

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()

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 <http://www.gnu.org/licenses/>.
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'status': ['stableinterface'],

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
 

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
 

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 <http://www.gnu.org/licenses/>.
 
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
                     'status': ['stableinterface'],

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
 

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
 

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()

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()

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()