From f31797c70ac6d1fe4a651def1f87350bec16d194 Mon Sep 17 00:00:00 2001 From: Stanislav Laznicka Date: Thu, 31 Aug 2017 10:45:31 +0200 Subject: [PATCH] Have all the scripts run in python 3 by default The Python 3 refactoring effort is finishing, it should be safe to turn all scripts to run in Python 3 by default. https://pagure.io/freeipa/issue/4985 Reviewed-By: Christian Heimes --- client/ipa-certupdate | 2 +- client/ipa-client-automount | 2 +- client/ipa-client-install | 2 +- contrib/copy-schema-to-ca-RHEL6.py | 2 +- daemons/dnssec/ipa-dnskeysync-replica | 2 +- daemons/dnssec/ipa-dnskeysyncd | 2 +- daemons/dnssec/ipa-ods-exporter | 2 +- daemons/ipa-otpd/test.py | 2 +- doc/examples/python-api.py | 2 +- freeipa.spec.in | 73 ++----------------- .../dogtag-ipa-ca-renew-agent-submit | 2 +- install/certmonger/ipa-server-guard | 2 +- .../oddjob/com.redhat.idm.trust-fetch-domains | 2 +- install/restart_scripts/renew_ca_cert | 2 +- install/restart_scripts/renew_kdc_cert | 2 +- install/restart_scripts/renew_ra_cert | 2 +- install/restart_scripts/renew_ra_cert_pre | 2 +- install/restart_scripts/restart_dirsrv | 2 +- install/restart_scripts/restart_httpd | 2 +- install/restart_scripts/stop_pkicad | 2 +- install/tools/ipa-adtrust-install | 2 +- install/tools/ipa-advise | 2 +- install/tools/ipa-backup | 2 +- install/tools/ipa-ca-install | 2 +- install/tools/ipa-cacert-manage | 2 +- install/tools/ipa-compat-manage | 2 +- install/tools/ipa-csreplica-manage | 2 +- install/tools/ipa-custodia | 2 +- install/tools/ipa-dns-install | 2 +- install/tools/ipa-httpd-kdcproxy | 2 +- install/tools/ipa-kra-install | 2 +- install/tools/ipa-ldap-updater | 2 +- install/tools/ipa-managed-entries | 2 +- install/tools/ipa-nis-manage | 2 +- install/tools/ipa-otptoken-import | 2 +- install/tools/ipa-pki-retrieve-key | 2 +- install/tools/ipa-pkinit-manage | 2 +- install/tools/ipa-replica-conncheck | 2 +- install/tools/ipa-replica-install | 2 +- install/tools/ipa-replica-manage | 2 +- install/tools/ipa-replica-prepare | 2 +- install/tools/ipa-restore | 2 +- install/tools/ipa-server-certinstall | 2 +- install/tools/ipa-server-install | 2 +- install/tools/ipa-server-upgrade | 2 +- install/tools/ipa-winsync-migrate | 2 +- install/tools/ipactl | 2 +- ipa | 2 +- ipaclient/csrgen_ffi.py | 2 +- ipaclient/setup.py | 2 +- ipalib/setup.py | 2 +- ipaplatform/setup.py | 2 +- ipapython/setup.py | 2 +- ipaserver/dnssec/localhsm.py | 2 +- ipaserver/dnssec/odsmgr.py | 2 +- ipaserver/install/ipa_kra_install.py | 2 +- ipaserver/setup.py | 2 +- ipatests/i18n.py | 2 +- ipatests/ipa-run-tests | 2 +- ipatests/ipa-test-config | 2 +- ipatests/ipa-test-task | 2 +- ipatests/pytest_plugins/beakerlib.py | 2 +- ipatests/setup.py | 2 +- ipatests/test_ipapython/test_ipavalidate.py | 2 +- makeaci | 2 +- makeapi | 2 +- 66 files changed, 70 insertions(+), 133 deletions(-) diff --git a/client/ipa-certupdate b/client/ipa-certupdate index d4168ed86..1fb530f5e 100755 --- a/client/ipa-certupdate +++ b/client/ipa-certupdate @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Jan Cholasta # # Copyright (C) 2014 Red Hat diff --git a/client/ipa-client-automount b/client/ipa-client-automount index 6c2816c41..2152b0032 100755 --- a/client/ipa-client-automount +++ b/client/ipa-client-automount @@ -1,4 +1,4 @@ -#!/usr/bin/python2 -E +#!/usr/bin/python3 -E # # Authors: # Rob Crittenden diff --git a/client/ipa-client-install b/client/ipa-client-install index 27711845e..bb8cb1e9b 100755 --- a/client/ipa-client-install +++ b/client/ipa-client-install @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Simo Sorce # Karl MacMillan # diff --git a/contrib/copy-schema-to-ca-RHEL6.py b/contrib/copy-schema-to-ca-RHEL6.py index 3ed16555e..a79e2b392 100755 --- a/contrib/copy-schema-to-ca-RHEL6.py +++ b/contrib/copy-schema-to-ca-RHEL6.py @@ -1,4 +1,4 @@ -#! /usr/bin/python2 +#!/usr/bin/python2 """Copy the IPA schema to the CA directory server instance diff --git a/daemons/dnssec/ipa-dnskeysync-replica b/daemons/dnssec/ipa-dnskeysync-replica index 6356aeb65..e2be3eae5 100755 --- a/daemons/dnssec/ipa-dnskeysync-replica +++ b/daemons/dnssec/ipa-dnskeysync-replica @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # # Copyright (C) 2014 FreeIPA Contributors see COPYING for license # diff --git a/daemons/dnssec/ipa-dnskeysyncd b/daemons/dnssec/ipa-dnskeysyncd index f0f413549..83df5129a 100755 --- a/daemons/dnssec/ipa-dnskeysyncd +++ b/daemons/dnssec/ipa-dnskeysyncd @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # # Copyright (C) 2014 FreeIPA Contributors see COPYING for license # diff --git a/daemons/dnssec/ipa-ods-exporter b/daemons/dnssec/ipa-ods-exporter index fb054c9cb..7c0553999 100755 --- a/daemons/dnssec/ipa-ods-exporter +++ b/daemons/dnssec/ipa-ods-exporter @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # # Copyright (C) 2014 FreeIPA Contributors see COPYING for license # diff --git a/daemons/ipa-otpd/test.py b/daemons/ipa-otpd/test.py index ea55f9b2a..5c288e57c 100644 --- a/daemons/ipa-otpd/test.py +++ b/daemons/ipa-otpd/test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # # FreeIPA 2FA companion daemon # diff --git a/doc/examples/python-api.py b/doc/examples/python-api.py index 3fde3fe32..533f26951 100755 --- a/doc/examples/python-api.py +++ b/doc/examples/python-api.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: # Jason Gerard DeRose # diff --git a/freeipa.spec.in b/freeipa.spec.in index c1c31e235..b9639d484 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -929,6 +929,8 @@ export JAVA_STACK_SIZE="8m" # PATH is workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1005235 export PATH=/usr/bin:/usr/sbin:$PATH export PYTHON=%{__python2} + +%if ! 0%{?with_python3} # Workaround: make sure all shebangs are pointing to Python 2 # This should be solved properly using setuptools # and this hack should be removed. @@ -937,64 +939,7 @@ find \ ! -name '*.pyo' -a \ -type f -exec grep -qsm1 '^#!.*\bpython' {} \; \ -exec sed -i -e '1 s|^#!.*\bpython[^ ]*|#!%{__python2}|' {} \; - -%if 0%{?with_python3} -# TODO: temporary solution until all scripts are ported to python3, -# TODO: workaround: some scripts are copied over, so the are always py2. -# We have to explicitly set python3 here for ported files here -PY3_SUBST_PATHS=' -client/ipa-certupdate -client/ipa-client-automount -client/ipa-client-install -daemons/dnssec/ipa-dnskeysyncd -daemons/dnssec/ipa-dnskeysync-replica -daemons/dnssec/ipa-ods-exporter -daemons/ipa-otpd/test.py -install/certmonger/ipa-server-guard -install/certmonger/dogtag-ipa-ca-renew-agent-submit -install/oddjob/com.redhat.idm.trust-fetch-domains -install/restart_scripts/renew_ra_cert_pre -install/restart_scripts/renew_ca_cert -install/restart_scripts/renew_ra_cert -install/restart_scripts/restart_httpd -install/restart_scripts/renew_kdc_cert -install/restart_scripts/stop_pkicad -install/restart_scripts/restart_dirsrv -install/tools/ipa-advise -install/tools/ipa-adtrust-install -install/tools/ipa-backup -install/tools/ipa-ca-install -install/tools/ipa-cacert-manage -install/tools/ipa-compat-manage -install/tools/ipa-csreplica-manage -install/tools/ipa-custodia -install/tools/ipa-custodia-check -install/tools/ipa-dns-install -install/tools/ipa-httpd-kdcproxy -install/tools/ipa-kra-install -install/tools/ipa-ldap-updater -install/tools/ipa-managed-entries -install/tools/ipa-nis-manage -install/tools/ipa-otptoken-import -install/tools/ipa-pkinit-manage -install/tools/ipa-pki-retrieve-key -install/tools/ipa-replica-conncheck -install/tools/ipa-replica-install -install/tools/ipa-replica-manage -install/tools/ipa-replica-prepare -install/tools/ipa-restore -install/tools/ipa-server-certinstall -install/tools/ipa-server-install -install/tools/ipa-server-upgrade -install/tools/ipa-winsync-migrate -install/tools/ipactl -ipa -' -for P in $PY3_SUBST_PATHS; do - sed -i -e '1 s|^#!\s\?.*\bpython[0-9]*|#!%{__python3}|' $P -done; - -%endif # with_python3 +%endif # ! with_python3 %configure --with-vendor-suffix=-%{release} \ %{enable_server_option} \ @@ -1005,22 +950,14 @@ done; %make_build -Onone %if 0%{?with_python3} -pushd %{_builddir}/freeipa-%{version}-python3 export PYTHON=%{__python3} -# Workaround: make sure all shebangs are pointing to Python 3 -# This should be solved properly using setuptools -# and this hack should be removed. -find \ - ! -name '*.pyc' -a \ - ! -name '*.pyo' -a \ - -type f -exec grep -qsm1 '^#!.*\bpython' {} \; \ - -exec sed -i -e '1 s|^#!.*\bpython[^ ]*|#!%{__python3}|' {} \; +pushd %{_builddir}/freeipa-%{version}-python3 %configure --with-vendor-suffix=-%{release} \ %{enable_server_option} \ %{with_ipatests_option} \ %{linter_options} popd -%endif # with_python3 +%endif # with_python3 %check make %{?_smp_mflags} check VERBOSE=yes LIBDIR=%{_libdir} diff --git a/install/certmonger/dogtag-ipa-ca-renew-agent-submit b/install/certmonger/dogtag-ipa-ca-renew-agent-submit index c33404c18..86810ab21 100755 --- a/install/certmonger/dogtag-ipa-ca-renew-agent-submit +++ b/install/certmonger/dogtag-ipa-ca-renew-agent-submit @@ -1,4 +1,4 @@ -#!/usr/bin/python2 -E +#!/usr/bin/python3 -E # # Authors: # Jan Cholasta diff --git a/install/certmonger/ipa-server-guard b/install/certmonger/ipa-server-guard index 2c5409718..9ee2a5fa0 100755 --- a/install/certmonger/ipa-server-guard +++ b/install/certmonger/ipa-server-guard @@ -1,4 +1,4 @@ -#!/usr/bin/python2 -E +#!/usr/bin/python3 -E # # Authors: # Jan Cholasta diff --git a/install/oddjob/com.redhat.idm.trust-fetch-domains b/install/oddjob/com.redhat.idm.trust-fetch-domains index 30150793d..51ffd8c35 100755 --- a/install/oddjob/com.redhat.idm.trust-fetch-domains +++ b/install/oddjob/com.redhat.idm.trust-fetch-domains @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from ipaserver import dcerpc from ipaserver.install.installutils import is_ipa_configured, ScriptError diff --git a/install/restart_scripts/renew_ca_cert b/install/restart_scripts/renew_ca_cert index 374a76d18..39b9c4c66 100644 --- a/install/restart_scripts/renew_ca_cert +++ b/install/restart_scripts/renew_ca_cert @@ -1,4 +1,4 @@ -#!/usr/bin/python2 -E +#!/usr/bin/python3 -E # # Authors: # Rob Crittenden diff --git a/install/restart_scripts/renew_kdc_cert b/install/restart_scripts/renew_kdc_cert index 14902893f..48935b29e 100755 --- a/install/restart_scripts/renew_kdc_cert +++ b/install/restart_scripts/renew_kdc_cert @@ -1,4 +1,4 @@ -#!/usr/bin/python2 -E +#!/usr/bin/python3 -E # # Copyright (C) 2017 FreeIPA Contributors see COPYING for license # diff --git a/install/restart_scripts/renew_ra_cert b/install/restart_scripts/renew_ra_cert index e37d7e525..2ea3be342 100644 --- a/install/restart_scripts/renew_ra_cert +++ b/install/restart_scripts/renew_ra_cert @@ -1,4 +1,4 @@ -#!/usr/bin/python2 -E +#!/usr/bin/python3 -E # # Authors: # Rob Crittenden diff --git a/install/restart_scripts/renew_ra_cert_pre b/install/restart_scripts/renew_ra_cert_pre index d0f743c09..151d98a5e 100755 --- a/install/restart_scripts/renew_ra_cert_pre +++ b/install/restart_scripts/renew_ra_cert_pre @@ -1,4 +1,4 @@ -#!/usr/bin/python2 -E +#!/usr/bin/python3 -E # # Copyright (C) 2015 FreeIPA Contributors see COPYING for license # diff --git a/install/restart_scripts/restart_dirsrv b/install/restart_scripts/restart_dirsrv index ff476cac4..01fca480e 100644 --- a/install/restart_scripts/restart_dirsrv +++ b/install/restart_scripts/restart_dirsrv @@ -1,4 +1,4 @@ -#!/usr/bin/python2 -E +#!/usr/bin/python3 -E # # Authors: # Rob Crittenden diff --git a/install/restart_scripts/restart_httpd b/install/restart_scripts/restart_httpd index d16848129..9b342bf1e 100644 --- a/install/restart_scripts/restart_httpd +++ b/install/restart_scripts/restart_httpd @@ -1,4 +1,4 @@ -#!/usr/bin/python2 -E +#!/usr/bin/python3 -E # # Authors: # Rob Crittenden diff --git a/install/restart_scripts/stop_pkicad b/install/restart_scripts/stop_pkicad index 133a4ef8f..f245a276f 100644 --- a/install/restart_scripts/stop_pkicad +++ b/install/restart_scripts/stop_pkicad @@ -1,4 +1,4 @@ -#!/usr/bin/python2 -E +#!/usr/bin/python3 -E # # Authors: # Rob Crittenden diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install index 6e0c60a04..6cab9ef59 100755 --- a/install/tools/ipa-adtrust-install +++ b/install/tools/ipa-adtrust-install @@ -1,4 +1,4 @@ -#! /usr/bin/python2 +#!/usr/bin/python3 # # Authors: Sumit Bose # Based on ipa-server-install by Karl MacMillan diff --git a/install/tools/ipa-advise b/install/tools/ipa-advise index 6d0d9b95d..527a04594 100755 --- a/install/tools/ipa-advise +++ b/install/tools/ipa-advise @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Tomas Babej # # Copyright (C) 2013 Red Hat diff --git a/install/tools/ipa-backup b/install/tools/ipa-backup index bcdcb3065..61bcb1074 100755 --- a/install/tools/ipa-backup +++ b/install/tools/ipa-backup @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Rob Crittenden # # Copyright (C) 2013 Red Hat diff --git a/install/tools/ipa-ca-install b/install/tools/ipa-ca-install index 212c432a1..cf0fe80fe 100755 --- a/install/tools/ipa-ca-install +++ b/install/tools/ipa-ca-install @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Rob Crittenden # # Copyright (C) 2011 Red Hat diff --git a/install/tools/ipa-cacert-manage b/install/tools/ipa-cacert-manage index 5e969b7b8..81f3e2f3b 100644 --- a/install/tools/ipa-cacert-manage +++ b/install/tools/ipa-cacert-manage @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Jan Cholasta # # Copyright (C) 2014 Red Hat diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage index 6dd259d2a..6444e0992 100755 --- a/install/tools/ipa-compat-manage +++ b/install/tools/ipa-compat-manage @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: Rob Crittenden # Authors: Simo Sorce # diff --git a/install/tools/ipa-csreplica-manage b/install/tools/ipa-csreplica-manage index 87f034d12..d44375cfa 100755 --- a/install/tools/ipa-csreplica-manage +++ b/install/tools/ipa-csreplica-manage @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Rob Crittenden # # Based on ipa-replica-manage by Karl MacMillan diff --git a/install/tools/ipa-custodia b/install/tools/ipa-custodia index 5deeeffdd..8a112e2c5 100755 --- a/install/tools/ipa-custodia +++ b/install/tools/ipa-custodia @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Copyright (C) 2017 IPA Project Contributors, see COPYING for license from ipaserver.secrets.service import main diff --git a/install/tools/ipa-dns-install b/install/tools/ipa-dns-install index 0e527b2e8..63f3d2afa 100755 --- a/install/tools/ipa-dns-install +++ b/install/tools/ipa-dns-install @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Martin Nagy # Based on ipa-server-install by Karl MacMillan # diff --git a/install/tools/ipa-httpd-kdcproxy b/install/tools/ipa-httpd-kdcproxy index 988dcedfb..5c6578864 100755 --- a/install/tools/ipa-httpd-kdcproxy +++ b/install/tools/ipa-httpd-kdcproxy @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: # Christian Heimes # diff --git a/install/tools/ipa-kra-install b/install/tools/ipa-kra-install index bc92d26fe..29b7d607b 100644 --- a/install/tools/ipa-kra-install +++ b/install/tools/ipa-kra-install @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Ade Lee # # Copyright (C) 2014 Red Hat diff --git a/install/tools/ipa-ldap-updater b/install/tools/ipa-ldap-updater index 98081d791..b34178159 100755 --- a/install/tools/ipa-ldap-updater +++ b/install/tools/ipa-ldap-updater @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: Rob Crittenden # # Copyright (C) 2008 Red Hat diff --git a/install/tools/ipa-managed-entries b/install/tools/ipa-managed-entries index 5bf0e43b6..e9be41b7a 100755 --- a/install/tools/ipa-managed-entries +++ b/install/tools/ipa-managed-entries @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: Jr Aquino # # Copyright (C) 2011 Red Hat diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage index c44b0f9ed..dbac9cb09 100755 --- a/install/tools/ipa-nis-manage +++ b/install/tools/ipa-nis-manage @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: Rob Crittenden # Authors: Simo Sorce # diff --git a/install/tools/ipa-otptoken-import b/install/tools/ipa-otptoken-import index 3309c33dd..c0076f132 100755 --- a/install/tools/ipa-otptoken-import +++ b/install/tools/ipa-otptoken-import @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Nathaniel McCallum # # Copyright (C) 2014 Red Hat diff --git a/install/tools/ipa-pki-retrieve-key b/install/tools/ipa-pki-retrieve-key index 5056682c3..95106c7fd 100755 --- a/install/tools/ipa-pki-retrieve-key +++ b/install/tools/ipa-pki-retrieve-key @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from __future__ import print_function diff --git a/install/tools/ipa-pkinit-manage b/install/tools/ipa-pkinit-manage index 5b2413bd7..0630c6eb2 100755 --- a/install/tools/ipa-pkinit-manage +++ b/install/tools/ipa-pkinit-manage @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # # Copyright (C) 2017 FreeIPA Contributors see COPYING for license # diff --git a/install/tools/ipa-replica-conncheck b/install/tools/ipa-replica-conncheck index 3306e1660..cc21cb7d5 100755 --- a/install/tools/ipa-replica-conncheck +++ b/install/tools/ipa-replica-conncheck @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Martin Kosek # # Copyright (C) 2011 Red Hat diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 44a9aa3f4..63a54e0b9 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Karl MacMillan # # Copyright (C) 2007 Red Hat diff --git a/install/tools/ipa-replica-manage b/install/tools/ipa-replica-manage index 75b02c929..06fefd443 100755 --- a/install/tools/ipa-replica-manage +++ b/install/tools/ipa-replica-manage @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Karl MacMillan # # Copyright (C) 2007 Red Hat diff --git a/install/tools/ipa-replica-prepare b/install/tools/ipa-replica-prepare index 4f37b4bee..ae551b5e8 100755 --- a/install/tools/ipa-replica-prepare +++ b/install/tools/ipa-replica-prepare @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Petr Viktorin # # Copyright (C) 2012 Red Hat diff --git a/install/tools/ipa-restore b/install/tools/ipa-restore index f2572d58a..e742f029b 100755 --- a/install/tools/ipa-restore +++ b/install/tools/ipa-restore @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Rob Crittenden # # Copyright (C) 2013 Red Hat diff --git a/install/tools/ipa-server-certinstall b/install/tools/ipa-server-certinstall index a0013f653..22067e855 100755 --- a/install/tools/ipa-server-certinstall +++ b/install/tools/ipa-server-certinstall @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Jan Cholasta # # Copyright (C) 2013 Red Hat diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 17be2f4e8..2878eb127 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Karl MacMillan # Simo Sorce # Rob Crittenden diff --git a/install/tools/ipa-server-upgrade b/install/tools/ipa-server-upgrade index 781b0d3db..a3a36cd39 100644 --- a/install/tools/ipa-server-upgrade +++ b/install/tools/ipa-server-upgrade @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # # Copyright (C) 2015 FreeIPA Contributors see COPYING for license # diff --git a/install/tools/ipa-winsync-migrate b/install/tools/ipa-winsync-migrate index 7ecee8c39..8b30f8434 100755 --- a/install/tools/ipa-winsync-migrate +++ b/install/tools/ipa-winsync-migrate @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Tomas Babej # # Copyright (C) 2015 Red Hat diff --git a/install/tools/ipactl b/install/tools/ipactl index ade91f7f7..82368c478 100755 --- a/install/tools/ipactl +++ b/install/tools/ipactl @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: Simo Sorce # # Copyright (C) 2008-2010 Red Hat diff --git a/ipa b/ipa index d6e01a228..4d9498afc 100755 --- a/ipa +++ b/ipa @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: # Jason Gerard DeRose diff --git a/ipaclient/csrgen_ffi.py b/ipaclient/csrgen_ffi.py index 577fdeefb..f1c1c7821 100644 --- a/ipaclient/csrgen_ffi.py +++ b/ipaclient/csrgen_ffi.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 from cffi import FFI import ctypes.util diff --git a/ipaclient/setup.py b/ipaclient/setup.py index ac947e772..aaab5c979 100644 --- a/ipaclient/setup.py +++ b/ipaclient/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Copyright (C) 2007 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/ipalib/setup.py b/ipalib/setup.py index 722fcebd3..d21f36e33 100644 --- a/ipalib/setup.py +++ b/ipalib/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Copyright (C) 2007 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/ipaplatform/setup.py b/ipaplatform/setup.py index 1098ab6f1..32cee9f87 100644 --- a/ipaplatform/setup.py +++ b/ipaplatform/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Copyright (C) 2014 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/ipapython/setup.py b/ipapython/setup.py index df2448fee..1d0ac043f 100755 --- a/ipapython/setup.py +++ b/ipapython/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Copyright (C) 2007 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/ipaserver/dnssec/localhsm.py b/ipaserver/dnssec/localhsm.py index 55a12f188..44ef6ae1a 100755 --- a/ipaserver/dnssec/localhsm.py +++ b/ipaserver/dnssec/localhsm.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # # Copyright (C) 2014 FreeIPA Contributors see COPYING for license # diff --git a/ipaserver/dnssec/odsmgr.py b/ipaserver/dnssec/odsmgr.py index 6b181e2e0..4bd051e28 100644 --- a/ipaserver/dnssec/odsmgr.py +++ b/ipaserver/dnssec/odsmgr.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # # Copyright (C) 2014 FreeIPA Contributors see COPYING for license # diff --git a/ipaserver/install/ipa_kra_install.py b/ipaserver/install/ipa_kra_install.py index 35ccf9765..bdc6f32a8 100644 --- a/ipaserver/install/ipa_kra_install.py +++ b/ipaserver/install/ipa_kra_install.py @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # Authors: Ade Lee # # Copyright (C) 2014 Red Hat diff --git a/ipaserver/setup.py b/ipaserver/setup.py index 46ce7505a..0f7d4709f 100755 --- a/ipaserver/setup.py +++ b/ipaserver/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: # Jason Gerard DeRose diff --git a/ipatests/i18n.py b/ipatests/i18n.py index 521fc30c4..976232f75 100755 --- a/ipatests/i18n.py +++ b/ipatests/i18n.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: # John Dennis # diff --git a/ipatests/ipa-run-tests b/ipatests/ipa-run-tests index d36fd3882..9d59ca3bd 100755 --- a/ipatests/ipa-run-tests +++ b/ipatests/ipa-run-tests @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: # Petr Viktorin diff --git a/ipatests/ipa-test-config b/ipatests/ipa-test-config index b03a2bb7d..e072fef3a 100755 --- a/ipatests/ipa-test-config +++ b/ipatests/ipa-test-config @@ -1,4 +1,4 @@ -#! /usr/bin/python2 +#!/usr/bin/python3 # Authors: # Petr Viktorin diff --git a/ipatests/ipa-test-task b/ipatests/ipa-test-task index 987149609..272226a3d 100755 --- a/ipatests/ipa-test-task +++ b/ipatests/ipa-test-task @@ -1,4 +1,4 @@ -#! /usr/bin/python2 +#!/usr/bin/python3 # Authors: # Petr Viktorin diff --git a/ipatests/pytest_plugins/beakerlib.py b/ipatests/pytest_plugins/beakerlib.py index 0bb4c978f..53e2a80e0 100644 --- a/ipatests/pytest_plugins/beakerlib.py +++ b/ipatests/pytest_plugins/beakerlib.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Copyright (C) 2014 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/ipatests/setup.py b/ipatests/setup.py index be4c75b33..7624117cc 100644 --- a/ipatests/setup.py +++ b/ipatests/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Copyright (C) 2007 Red Hat # see file 'COPYING' for use and warranty information # diff --git a/ipatests/test_ipapython/test_ipavalidate.py b/ipatests/test_ipapython/test_ipavalidate.py index 54a62f664..a4e5ddefe 100644 --- a/ipatests/test_ipapython/test_ipavalidate.py +++ b/ipatests/test_ipapython/test_ipavalidate.py @@ -1,4 +1,4 @@ -#! /usr/bin/python2 -E +#!/usr/bin/python3 -E # # Copyright (C) 2007 Red Hat # see file 'COPYING' for use and warranty information diff --git a/makeaci b/makeaci index 4d2c75bcb..4e92e2d60 100755 --- a/makeaci +++ b/makeaci @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: # Petr Viktorin # John Dennis diff --git a/makeapi b/makeapi index 05bd684a8..735b22687 100755 --- a/makeapi +++ b/makeapi @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 # Authors: # Rob Crittenden # John Dennis