From b5d7b08addeb7795720acf3debd88a13ddd30402 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Thu, 11 May 2023 17:05:54 +0800 Subject: [PATCH] python3: ensure py scripts use py3 for shebang Upstream-Status: Pending Signed-off-by: Mark Asselstine Rebase to 2.24.5 Signed-off-by: Mingli Yu --- .azure-pipelines/scripts/combine-coverage.py | 2 +- .azure-pipelines/scripts/publish-codecov.py | 2 +- .azure-pipelines/scripts/time-command.py | 2 +- docs/bin/find-plugin-refs.py | 2 +- docs/docsite/rst/dev_guide/testing/sanity/shebang.rst | 2 +- docs/docsite/rst/inventory_guide/connection_details.rst | 4 ++-- docs/docsite/rst/locales/ja/LC_MESSAGES/dev_guide.po | 4 ++-- examples/scripts/uptime.py | 2 +- hacking/ansible-profile | 2 +- hacking/azp/download.py | 2 +- hacking/azp/get_recent_coverage_runs.py | 2 +- hacking/azp/incidental.py | 2 +- hacking/azp/run.py | 2 +- hacking/backport/backport_of_line_adder.py | 2 +- hacking/build-ansible.py | 2 +- hacking/create_deprecation_bug_reports.py | 2 +- hacking/fix_test_syntax.py | 2 +- hacking/get_library.py | 2 +- hacking/report.py | 2 +- hacking/return_skeleton_generator.py | 2 +- hacking/test-module.py | 2 +- hacking/tests/gen_distribution_version_testcase.py | 2 +- hacking/update-sanity-requirements.py | 2 +- lib/ansible/cli/adhoc.py | 2 +- lib/ansible/cli/config.py | 2 +- lib/ansible/cli/console.py | 2 +- lib/ansible/cli/doc.py | 2 +- lib/ansible/cli/galaxy.py | 2 +- lib/ansible/cli/inventory.py | 2 +- lib/ansible/cli/playbook.py | 2 +- lib/ansible/cli/pull.py | 2 +- lib/ansible/cli/scripts/ansible_connection_cli_stub.py | 2 +- lib/ansible/cli/vault.py | 2 +- packaging/release.py | 2 +- packaging/sdist/check-link-behavior.py | 2 +- .../targets/ansible-galaxy-collection/files/build_bad_tar.py | 2 +- test/integration/targets/ansible-test-container/runme.py | 2 +- .../targets/ansible-test-integration-targets/test.py | 2 +- .../ansible_collections/ns/col/run-with-pty.py | 2 +- .../ns/col/tests/integration/targets/no-tty/assert-no-tty.py | 2 +- .../ansible_collections/ns/col/scripts/env_python.py | 2 +- .../ns/col/tests/integration/targets/valid/env_python.py | 2 +- test/integration/targets/ansible-test/venv-pythons.py | 2 +- test/integration/targets/ansible-vault/faux-editor.py | 2 +- test/integration/targets/ansible-vault/password-script.py | 2 +- test/integration/targets/ansible-vault/test-vault-client.py | 2 +- .../targets/builtin_vars_prompt/test-vars_prompt.py | 2 +- test/integration/targets/cli/test-cli.py | 2 +- test/integration/targets/cli/test_k_and_K.py | 2 +- test/integration/targets/collection/update-ignore.py | 2 +- test/integration/targets/debugger/test_run_once.py | 2 +- test/integration/targets/fork_safe_stdio/run-with-pty.py | 2 +- test/integration/targets/gathering/uuid.fact | 2 +- test/integration/targets/gathering_facts/uuid.fact | 2 +- test/integration/targets/group/files/gidget.py | 2 +- test/integration/targets/module_utils/module_utils/foo.py | 2 +- test/integration/targets/module_utils/module_utils/sub/bam.py | 2 +- .../targets/module_utils/module_utils/sub/bam/bam.py | 2 +- .../targets/module_utils/module_utils/sub/bar/bam.py | 2 +- .../targets/module_utils/module_utils/sub/bar/bar.py | 2 +- test/integration/targets/pause/test-pause.py | 2 +- test/integration/targets/pip/files/setup.py | 2 +- .../integration/targets/service/files/ansible_test_service.py | 2 +- .../targets/service_facts/files/ansible_test_service.py | 2 +- .../targets/template/role_filter/filter_plugins/myplugin.py | 2 +- test/integration/targets/throttle/test_throttle.py | 2 +- .../targets/var_precedence/ansible-var-precedence-check.py | 2 +- test/lib/ansible_test/_internal/util_common.py | 2 +- .../_util/controller/sanity/code-smell/shebang.py | 4 ++-- .../ansible_test/_util/target/cli/ansible_test_cli_stub.py | 2 +- test/units/executor/module_common/test_module_common.py | 4 ++-- 71 files changed, 75 insertions(+), 75 deletions(-) diff --git a/.azure-pipelines/scripts/combine-coverage.py b/.azure-pipelines/scripts/combine-coverage.py index 506ade6460c..15bee402341 100755 --- a/.azure-pipelines/scripts/combine-coverage.py +++ b/.azure-pipelines/scripts/combine-coverage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Combine coverage data from multiple jobs, keeping the data only from the most recent attempt from each job. Coverage artifacts must be named using the format: "Coverage $(System.JobAttempt) {StableUniqueNameForEachJob}" diff --git a/.azure-pipelines/scripts/publish-codecov.py b/.azure-pipelines/scripts/publish-codecov.py index f2bc4b84b38..01ad32f494c 100755 --- a/.azure-pipelines/scripts/publish-codecov.py +++ b/.azure-pipelines/scripts/publish-codecov.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Upload code coverage reports to codecov.io. Multiple coverage files from multiple languages are accepted and aggregated after upload. diff --git a/.azure-pipelines/scripts/time-command.py b/.azure-pipelines/scripts/time-command.py index 5e8eb8d4c8f..5450c48900e 100755 --- a/.azure-pipelines/scripts/time-command.py +++ b/.azure-pipelines/scripts/time-command.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Prepends a relative timestamp to each input line from stdin and writes it to stdout.""" from __future__ import (absolute_import, division, print_function) diff --git a/docs/bin/find-plugin-refs.py b/docs/bin/find-plugin-refs.py index d603409d688..c52d6d13e38 100755 --- a/docs/bin/find-plugin-refs.py +++ b/docs/bin/find-plugin-refs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # To run this script, first make webdocs in the toplevel of the checkout. This will generate all # rst files from their sources. Then run this script ./docs/bin/find-plugin-refs.py diff --git a/docs/docsite/rst/dev_guide/testing/sanity/shebang.rst b/docs/docsite/rst/dev_guide/testing/sanity/shebang.rst index cff2aa0914b..7c4bd651563 100644 --- a/docs/docsite/rst/dev_guide/testing/sanity/shebang.rst +++ b/docs/docsite/rst/dev_guide/testing/sanity/shebang.rst @@ -6,7 +6,7 @@ Most executable files should only use one of the following shebangs: - ``#!/bin/sh`` - ``#!/bin/bash`` - ``#!/usr/bin/make`` -- ``#!/usr/bin/env python`` +- ``#!/usr/bin/env python3`` - ``#!/usr/bin/env bash`` NOTE: For ``#!/bin/bash``, any of the options ``eux`` may also be used, such as ``#!/bin/bash -eux``. diff --git a/docs/docsite/rst/inventory_guide/connection_details.rst b/docs/docsite/rst/inventory_guide/connection_details.rst index 5e332160617..65bfd5903ad 100644 --- a/docs/docsite/rst/inventory_guide/connection_details.rst +++ b/docs/docsite/rst/inventory_guide/connection_details.rst @@ -84,13 +84,13 @@ You can run commands against the control node by using "localhost" or "127.0.0.1 .. code-block:: bash - $ ansible localhost -m ping -e 'ansible_python_interpreter="/usr/bin/env python"' + $ ansible localhost -m ping -e 'ansible_python_interpreter="/usr/bin/env python3"' You can specify localhost explicitly by adding this to your inventory file: .. code-block:: bash - localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env python" + localhost ansible_connection=local ansible_python_interpreter="/usr/bin/env python3" .. _host_key_checking_on: diff --git a/docs/docsite/rst/locales/ja/LC_MESSAGES/dev_guide.po b/docs/docsite/rst/locales/ja/LC_MESSAGES/dev_guide.po index b6abc3e5874..53f5fdc8986 100644 --- a/docs/docsite/rst/locales/ja/LC_MESSAGES/dev_guide.po +++ b/docs/docsite/rst/locales/ja/LC_MESSAGES/dev_guide.po @@ -11820,8 +11820,8 @@ msgid "``#!/usr/bin/make``" msgstr "``#!/usr/bin/make``" #: ../../rst/dev_guide/testing/sanity/shebang.rst:9 -msgid "``#!/usr/bin/env python``" -msgstr "``#!/usr/bin/env python``" +msgid "``#!/usr/bin/env python3``" +msgstr "``#!/usr/bin/env python3``" #: ../../rst/dev_guide/testing/sanity/shebang.rst:10 msgid "``#!/usr/bin/env bash``" diff --git a/examples/scripts/uptime.py b/examples/scripts/uptime.py index d77a5fb5660..665594c254b 100755 --- a/examples/scripts/uptime.py +++ b/examples/scripts/uptime.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type diff --git a/hacking/ansible-profile b/hacking/ansible-profile index 6612402da62..d67526a1619 100755 --- a/hacking/ansible-profile +++ b/hacking/ansible-profile @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type diff --git a/hacking/azp/download.py b/hacking/azp/download.py index 117e9da5b7a..89466cb17be 100755 --- a/hacking/azp/download.py +++ b/hacking/azp/download.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # PYTHON_ARGCOMPLETE_OK # (c) 2016 Red Hat, Inc. diff --git a/hacking/azp/get_recent_coverage_runs.py b/hacking/azp/get_recent_coverage_runs.py index 25e2fa8120a..9b0d9b972ed 100755 --- a/hacking/azp/get_recent_coverage_runs.py +++ b/hacking/azp/get_recent_coverage_runs.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (c) 2020 Red Hat, Inc. # diff --git a/hacking/azp/incidental.py b/hacking/azp/incidental.py index 87d4d213c94..7660e2ed226 100755 --- a/hacking/azp/incidental.py +++ b/hacking/azp/incidental.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # PYTHON_ARGCOMPLETE_OK # (c) 2020 Red Hat, Inc. diff --git a/hacking/azp/run.py b/hacking/azp/run.py index 00a177944f8..591e6bcc4fe 100755 --- a/hacking/azp/run.py +++ b/hacking/azp/run.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # PYTHON_ARGCOMPLETE_OK # (c) 2016 Red Hat, Inc. diff --git a/hacking/backport/backport_of_line_adder.py b/hacking/backport/backport_of_line_adder.py index ef77ddcf400..bbec15de6a2 100755 --- a/hacking/backport/backport_of_line_adder.py +++ b/hacking/backport/backport_of_line_adder.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (c) 2020, Red Hat, Inc. # # This file is part of Ansible diff --git a/hacking/build-ansible.py b/hacking/build-ansible.py index c108c1861fa..8ebb88d33bd 100755 --- a/hacking/build-ansible.py +++ b/hacking/build-ansible.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # coding: utf-8 # PYTHON_ARGCOMPLETE_OK # Copyright: (c) 2019, Ansible Project diff --git a/hacking/create_deprecation_bug_reports.py b/hacking/create_deprecation_bug_reports.py index e14df4be389..e6b9b9025c3 100755 --- a/hacking/create_deprecation_bug_reports.py +++ b/hacking/create_deprecation_bug_reports.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # PYTHON_ARGCOMPLETE_OK """Create GitHub issues for deprecated features.""" diff --git a/hacking/fix_test_syntax.py b/hacking/fix_test_syntax.py index 7178033406a..78d87ef71cb 100755 --- a/hacking/fix_test_syntax.py +++ b/hacking/fix_test_syntax.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # (c) 2017, Matt Martz # diff --git a/hacking/get_library.py b/hacking/get_library.py index 23bf4a39bb5..9346784398f 100755 --- a/hacking/get_library.py +++ b/hacking/get_library.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (c) 2014, Will Thames # diff --git a/hacking/report.py b/hacking/report.py index 58b3a6b915a..78eed516dc0 100755 --- a/hacking/report.py +++ b/hacking/report.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # PYTHON_ARGCOMPLETE_OK """A tool to aggregate data about Ansible source and testing into a sqlite DB for reporting.""" diff --git a/hacking/return_skeleton_generator.py b/hacking/return_skeleton_generator.py index 7002b7899d5..cff03c38e6b 100755 --- a/hacking/return_skeleton_generator.py +++ b/hacking/return_skeleton_generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (c) 2017, Will Thames # diff --git a/hacking/test-module.py b/hacking/test-module.py index 54343e07e8b..38d4b8c60bb 100755 --- a/hacking/test-module.py +++ b/hacking/test-module.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (c) 2012, Michael DeHaan # diff --git a/hacking/tests/gen_distribution_version_testcase.py b/hacking/tests/gen_distribution_version_testcase.py index 2fc5a2f9328..18e67d7d121 100755 --- a/hacking/tests/gen_distribution_version_testcase.py +++ b/hacking/tests/gen_distribution_version_testcase.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ This script generated test_cases for test_distribution_version.py. diff --git a/hacking/update-sanity-requirements.py b/hacking/update-sanity-requirements.py index 747f058880a..2570ab2c7d3 100755 --- a/hacking/update-sanity-requirements.py +++ b/hacking/update-sanity-requirements.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # PYTHON_ARGCOMPLETE_OK """Generate frozen sanity test requirements from source requirements files.""" diff --git a/lib/ansible/cli/adhoc.py b/lib/ansible/cli/adhoc.py index e90b44ce101..120948c7495 100755 --- a/lib/ansible/cli/adhoc.py +++ b/lib/ansible/cli/adhoc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright: (c) 2012, Michael DeHaan # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/lib/ansible/cli/config.py b/lib/ansible/cli/config.py index 3a5c24214b1..98d7a732517 100755 --- a/lib/ansible/cli/config.py +++ b/lib/ansible/cli/config.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # PYTHON_ARGCOMPLETE_OK diff --git a/lib/ansible/cli/console.py b/lib/ansible/cli/console.py index 3125cc47a7f..4a2f38bb48e 100755 --- a/lib/ansible/cli/console.py +++ b/lib/ansible/cli/console.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright: (c) 2014, Nandor Sivok # Copyright: (c) 2016, Redhat Inc # Copyright: (c) 2018, Ansible Project diff --git a/lib/ansible/cli/doc.py b/lib/ansible/cli/doc.py index 9f560bcbc6d..a0d34d92f6d 100755 --- a/lib/ansible/cli/doc.py +++ b/lib/ansible/cli/doc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright: (c) 2014, James Tanner # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py index c280380c18c..0357401c749 100755 --- a/lib/ansible/cli/galaxy.py +++ b/lib/ansible/cli/galaxy.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright: (c) 2013, James Cammarata # Copyright: (c) 2018-2021, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/lib/ansible/cli/inventory.py b/lib/ansible/cli/inventory.py index e8ed75e4636..e4bb334932e 100755 --- a/lib/ansible/cli/inventory.py +++ b/lib/ansible/cli/inventory.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright: (c) 2017, Brian Coca # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/lib/ansible/cli/playbook.py b/lib/ansible/cli/playbook.py index 9c091a675a9..27ff7d442e4 100755 --- a/lib/ansible/cli/playbook.py +++ b/lib/ansible/cli/playbook.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (c) 2012, Michael DeHaan # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/lib/ansible/cli/pull.py b/lib/ansible/cli/pull.py index dc8f055b44d..0e5b030eecf 100755 --- a/lib/ansible/cli/pull.py +++ b/lib/ansible/cli/pull.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright: (c) 2012, Michael DeHaan # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/lib/ansible/cli/scripts/ansible_connection_cli_stub.py b/lib/ansible/cli/scripts/ansible_connection_cli_stub.py index 9109137e7f8..f01b1ec58dc 100755 --- a/lib/ansible/cli/scripts/ansible_connection_cli_stub.py +++ b/lib/ansible/cli/scripts/ansible_connection_cli_stub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright: (c) 2017, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) from __future__ import (absolute_import, division, print_function) diff --git a/lib/ansible/cli/vault.py b/lib/ansible/cli/vault.py index 3e60329de60..69499407479 100755 --- a/lib/ansible/cli/vault.py +++ b/lib/ansible/cli/vault.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # (c) 2014, James Tanner # Copyright: (c) 2018, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/packaging/release.py b/packaging/release.py index 1d1ba37117a..a561dc6a905 100755 --- a/packaging/release.py +++ b/packaging/release.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # PYTHON_ARGCOMPLETE_OK """Manage upstream ansible-core releases.""" diff --git a/packaging/sdist/check-link-behavior.py b/packaging/sdist/check-link-behavior.py index 34e05023d48..42f6c4be98f 100755 --- a/packaging/sdist/check-link-behavior.py +++ b/packaging/sdist/check-link-behavior.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Checks for link behavior required for sdist to retain symlinks.""" from __future__ import (absolute_import, division, print_function) diff --git a/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py b/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py index 6182e865db0..5829df52b5b 100644 --- a/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py +++ b/test/integration/targets/ansible-galaxy-collection/files/build_bad_tar.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright: (c) 2020, Ansible Project # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/test/integration/targets/ansible-test-container/runme.py b/test/integration/targets/ansible-test-container/runme.py index 687128056f7..bd7f3671655 100755 --- a/test/integration/targets/ansible-test-container/runme.py +++ b/test/integration/targets/ansible-test-container/runme.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Test suite used to verify ansible-test is able to run its containers on various container hosts.""" from __future__ import annotations diff --git a/test/integration/targets/ansible-test-integration-targets/test.py b/test/integration/targets/ansible-test-integration-targets/test.py index 8effb647fca..4e34c4bbc16 100755 --- a/test/integration/targets/ansible-test-integration-targets/test.py +++ b/test/integration/targets/ansible-test-integration-targets/test.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import subprocess import unittest diff --git a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py index 463915284b2..fc2ed398d9f 100755 --- a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py +++ b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/run-with-pty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Run a command using a PTY.""" import sys diff --git a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py index a2b094e2fca..355dba697a9 100755 --- a/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py +++ b/test/integration/targets/ansible-test-no-tty/ansible_collections/ns/col/tests/integration/targets/no-tty/assert-no-tty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Assert no TTY is available.""" import sys diff --git a/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/scripts/env_python.py b/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/scripts/env_python.py index 4265cc3e6c1..e5a0d9b4834 100755 --- a/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/scripts/env_python.py +++ b/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/scripts/env_python.py @@ -1 +1 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 diff --git a/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/tests/integration/targets/valid/env_python.py b/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/tests/integration/targets/valid/env_python.py index 4265cc3e6c1..e5a0d9b4834 100755 --- a/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/tests/integration/targets/valid/env_python.py +++ b/test/integration/targets/ansible-test-sanity-shebang/ansible_collections/ns/col/tests/integration/targets/valid/env_python.py @@ -1 +1 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 diff --git a/test/integration/targets/ansible-test/venv-pythons.py b/test/integration/targets/ansible-test/venv-pythons.py index b380f147fca..e97f2fcb33d 100755 --- a/test/integration/targets/ansible-test/venv-pythons.py +++ b/test/integration/targets/ansible-test/venv-pythons.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Return target Python options for use with ansible-test.""" import os diff --git a/test/integration/targets/ansible-vault/faux-editor.py b/test/integration/targets/ansible-vault/faux-editor.py index b67c7475631..a30c306a831 100755 --- a/test/integration/targets/ansible-vault/faux-editor.py +++ b/test/integration/targets/ansible-vault/faux-editor.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Ansible is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/integration/targets/ansible-vault/password-script.py b/test/integration/targets/ansible-vault/password-script.py index 1b7f02beb23..0dcada23c7e 100755 --- a/test/integration/targets/ansible-vault/password-script.py +++ b/test/integration/targets/ansible-vault/password-script.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Ansible is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/test/integration/targets/ansible-vault/test-vault-client.py b/test/integration/targets/ansible-vault/test-vault-client.py index ee46188742d..48244fca09e 100755 --- a/test/integration/targets/ansible-vault/test-vault-client.py +++ b/test/integration/targets/ansible-vault/test-vault-client.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- from __future__ import (absolute_import, division, print_function) diff --git a/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py b/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py index 93958fc2adb..33509c826a3 100644 --- a/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py +++ b/test/integration/targets/builtin_vars_prompt/test-vars_prompt.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type diff --git a/test/integration/targets/cli/test-cli.py b/test/integration/targets/cli/test-cli.py index 9893d6652ed..7a07dcc108e 100644 --- a/test/integration/targets/cli/test-cli.py +++ b/test/integration/targets/cli/test-cli.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2019 Matt Martz # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) diff --git a/test/integration/targets/cli/test_k_and_K.py b/test/integration/targets/cli/test_k_and_K.py index f7077fba0ab..dcc96141295 100644 --- a/test/integration/targets/cli/test_k_and_K.py +++ b/test/integration/targets/cli/test_k_and_K.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt) # Make coding more python3-ish diff --git a/test/integration/targets/collection/update-ignore.py b/test/integration/targets/collection/update-ignore.py index 92a702cf13e..9ea69089d58 100755 --- a/test/integration/targets/collection/update-ignore.py +++ b/test/integration/targets/collection/update-ignore.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Rewrite a sanity ignore file to expand Python versions for import ignores and write the file out with the correct Ansible version in the name.""" import os diff --git a/test/integration/targets/debugger/test_run_once.py b/test/integration/targets/debugger/test_run_once.py index 237f9c2d903..4fe74903d8d 100755 --- a/test/integration/targets/debugger/test_run_once.py +++ b/test/integration/targets/debugger/test_run_once.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import io import os diff --git a/test/integration/targets/fork_safe_stdio/run-with-pty.py b/test/integration/targets/fork_safe_stdio/run-with-pty.py index 463915284b2..fc2ed398d9f 100755 --- a/test/integration/targets/fork_safe_stdio/run-with-pty.py +++ b/test/integration/targets/fork_safe_stdio/run-with-pty.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """Run a command using a PTY.""" import sys diff --git a/test/integration/targets/gathering/uuid.fact b/test/integration/targets/gathering/uuid.fact index 79e3f62677e..2a294b33a82 100644 --- a/test/integration/targets/gathering/uuid.fact +++ b/test/integration/targets/gathering/uuid.fact @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- diff --git a/test/integration/targets/gathering_facts/uuid.fact b/test/integration/targets/gathering_facts/uuid.fact index 79e3f62677e..2a294b33a82 100644 --- a/test/integration/targets/gathering_facts/uuid.fact +++ b/test/integration/targets/gathering_facts/uuid.fact @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # -*- coding: utf-8 -*- diff --git a/test/integration/targets/group/files/gidget.py b/test/integration/targets/group/files/gidget.py index 4b771516fdd..085dfcdee11 100644 --- a/test/integration/targets/group/files/gidget.py +++ b/test/integration/targets/group/files/gidget.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type diff --git a/test/integration/targets/module_utils/module_utils/foo.py b/test/integration/targets/module_utils/module_utils/foo.py index 20698f1f463..0cd5c851429 100644 --- a/test/integration/targets/module_utils/module_utils/foo.py +++ b/test/integration/targets/module_utils/module_utils/foo.py @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 foo = "FOO FROM foo.py" diff --git a/test/integration/targets/module_utils/module_utils/sub/bam.py b/test/integration/targets/module_utils/module_utils/sub/bam.py index 566f8b7c47f..0814485d5fe 100644 --- a/test/integration/targets/module_utils/module_utils/sub/bam.py +++ b/test/integration/targets/module_utils/module_utils/sub/bam.py @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 bam = "BAM FROM sub/bam.py" diff --git a/test/integration/targets/module_utils/module_utils/sub/bam/bam.py b/test/integration/targets/module_utils/module_utils/sub/bam/bam.py index b7ed707211e..97f9eedcdb7 100644 --- a/test/integration/targets/module_utils/module_utils/sub/bam/bam.py +++ b/test/integration/targets/module_utils/module_utils/sub/bam/bam.py @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 bam = "BAM FROM sub/bam/bam.py" diff --git a/test/integration/targets/module_utils/module_utils/sub/bar/bam.py b/test/integration/targets/module_utils/module_utils/sub/bar/bam.py index 02fafd40f3f..3a93360c69e 100644 --- a/test/integration/targets/module_utils/module_utils/sub/bar/bam.py +++ b/test/integration/targets/module_utils/module_utils/sub/bar/bam.py @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 bam = "BAM FROM sub/bar/bam.py" diff --git a/test/integration/targets/module_utils/module_utils/sub/bar/bar.py b/test/integration/targets/module_utils/module_utils/sub/bar/bar.py index 8566901f044..40f0c9446c9 100644 --- a/test/integration/targets/module_utils/module_utils/sub/bar/bar.py +++ b/test/integration/targets/module_utils/module_utils/sub/bar/bar.py @@ -1,3 +1,3 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 bar = "BAR FROM sub/bar/bar.py" diff --git a/test/integration/targets/pause/test-pause.py b/test/integration/targets/pause/test-pause.py index 3703470d065..dd14b2810d6 100755 --- a/test/integration/targets/pause/test-pause.py +++ b/test/integration/targets/pause/test-pause.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type diff --git a/test/integration/targets/pip/files/setup.py b/test/integration/targets/pip/files/setup.py index aaf21875ca2..2835719e4f2 100755 --- a/test/integration/targets/pip/files/setup.py +++ b/test/integration/targets/pip/files/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type diff --git a/test/integration/targets/service/files/ansible_test_service.py b/test/integration/targets/service/files/ansible_test_service.py index 522493fcc77..b3aaf7f6b43 100644 --- a/test/integration/targets/service/files/ansible_test_service.py +++ b/test/integration/targets/service/files/ansible_test_service.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # this is mostly based off of the code found here: # http://code.activestate.com/recipes/278731-creating-a-daemon-the-python-way/ diff --git a/test/integration/targets/service_facts/files/ansible_test_service.py b/test/integration/targets/service_facts/files/ansible_test_service.py index 19f1e291388..609218325d6 100644 --- a/test/integration/targets/service_facts/files/ansible_test_service.py +++ b/test/integration/targets/service_facts/files/ansible_test_service.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # this is mostly based off of the code found here: # http://code.activestate.com/recipes/278731-creating-a-daemon-the-python-way/ diff --git a/test/integration/targets/template/role_filter/filter_plugins/myplugin.py b/test/integration/targets/template/role_filter/filter_plugins/myplugin.py index b0a8889439a..90c83b582b4 100644 --- a/test/integration/targets/template/role_filter/filter_plugins/myplugin.py +++ b/test/integration/targets/template/role_filter/filter_plugins/myplugin.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type diff --git a/test/integration/targets/throttle/test_throttle.py b/test/integration/targets/throttle/test_throttle.py index 1a5bdd30789..344bcf0f868 100755 --- a/test/integration/targets/throttle/test_throttle.py +++ b/test/integration/targets/throttle/test_throttle.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 from __future__ import (absolute_import, division, print_function) __metaclass__ = type diff --git a/test/integration/targets/var_precedence/ansible-var-precedence-check.py b/test/integration/targets/var_precedence/ansible-var-precedence-check.py index fc31688be2e..f964bbe8d6d 100755 --- a/test/integration/targets/var_precedence/ansible-var-precedence-check.py +++ b/test/integration/targets/var_precedence/ansible-var-precedence-check.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # A tool to check the order of precedence for ansible variables # https://github.com/ansible/ansible/blob/devel/test/integration/test_var_precedence.yml diff --git a/test/lib/ansible_test/_internal/util_common.py b/test/lib/ansible_test/_internal/util_common.py index 79ff6c03ae3..730c87d3fc1 100644 --- a/test/lib/ansible_test/_internal/util_common.py +++ b/test/lib/ansible_test/_internal/util_common.py @@ -271,7 +271,7 @@ def get_injector_path() -> str: ]) scripts = ( - ('python.py', '/usr/bin/env python', MODE_FILE_EXECUTE), + ('python.py', '/usr/bin/env python3', MODE_FILE_EXECUTE), ('virtualenv.sh', '/usr/bin/env bash', MODE_FILE), ) diff --git a/test/lib/ansible_test/_util/controller/sanity/code-smell/shebang.py b/test/lib/ansible_test/_util/controller/sanity/code-smell/shebang.py index b0b13197839..9535c3b4819 100644 --- a/test/lib/ansible_test/_util/controller/sanity/code-smell/shebang.py +++ b/test/lib/ansible_test/_util/controller/sanity/code-smell/shebang.py @@ -16,14 +16,14 @@ def main(): b'#!/usr/bin/env bash', b'#!/usr/bin/env fish', b'#!/usr/bin/env pwsh', - b'#!/usr/bin/env python', + b'#!/usr/bin/env python3', b'#!/usr/bin/make -f', ]) integration_shebangs = set([ b'#!/bin/sh', b'#!/usr/bin/env bash', - b'#!/usr/bin/env python', + b'#!/usr/bin/env python3', ]) module_shebangs = { diff --git a/test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py b/test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py index 930654fc1e7..bbf50369d7d 100755 --- a/test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py +++ b/test/lib/ansible_test/_util/target/cli/ansible_test_cli_stub.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # PYTHON_ARGCOMPLETE_OK """Command line entry point for ansible-test.""" diff --git a/test/units/executor/module_common/test_module_common.py b/test/units/executor/module_common/test_module_common.py index fa6add8cd61..fcfd096e546 100644 --- a/test/units/executor/module_common/test_module_common.py +++ b/test/units/executor/module_common/test_module_common.py @@ -132,8 +132,8 @@ class TestGetShebang: (u'#!/usr/bin/python3 -tt -OO', u'/usr/bin/python3') def test_python_via_env(self, templar): - assert amc._get_shebang(u'/usr/bin/python', {u'ansible_python_interpreter': u'/usr/bin/env python'}, templar) == \ - (u'#!/usr/bin/env python', u'/usr/bin/env python') + assert amc._get_shebang(u'/usr/bin/python', {u'ansible_python_interpreter': u'/usr/bin/env python3'}, templar) == \ + (u'#!/usr/bin/env python3', u'/usr/bin/env python3') class TestDetectionRegexes: -- 2.25.1