IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-03 12:11:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Have all the scripts run in python 3 by default

Browse Source 
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 <cheimes@redhat.com>
This commit is contained in:
Stanislav Laznicka 2017-08-31 10:45:31 +02:00 committed by Christian Heimes
parent 1b0c55a3b3
commit f31797c70a
66 changed files with 70 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/ipa-certupdate
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Jan Cholasta <jcholast@redhat.com>
#
# Copyright (C) 2014 Red Hat

2
client/ipa-client-automount
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2 -E
#!/usr/bin/python3 -E
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>

2
client/ipa-client-install
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Simo Sorce <ssorce@redhat.com>
# Karl MacMillan <kmacmillan@mentalrootkit.com>
#

2
contrib/copy-schema-to-ca-RHEL6.py
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2
#!/usr/bin/python2
"""Copy the IPA schema to the CA directory server instance

2
daemons/dnssec/ipa-dnskeysync-replica
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
#
# Copyright (C) 2014 FreeIPA Contributors see COPYING for license
#

2
daemons/dnssec/ipa-dnskeysyncd
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
#
# Copyright (C) 2014 FreeIPA Contributors see COPYING for license
#

2
daemons/dnssec/ipa-ods-exporter
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
#
# Copyright (C) 2014 FreeIPA Contributors see COPYING for license
#

2
daemons/ipa-otpd/test.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
#
# FreeIPA 2FA companion daemon
#

2
doc/examples/python-api.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors:
# Jason Gerard DeRose <jderose@redhat.com>
#

73
freeipa.spec.in
View File

@ -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}

2
install/certmonger/dogtag-ipa-ca-renew-agent-submit
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2 -E
#!/usr/bin/python3 -E
#
# Authors:
# Jan Cholasta <jcholast@redhat.com>

2
install/certmonger/ipa-server-guard
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2 -E
#!/usr/bin/python3 -E
#
# Authors:
# Jan Cholasta <jcholast@redhat.com>

2
install/oddjob/com.redhat.idm.trust-fetch-domains
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
from ipaserver import dcerpc
from ipaserver.install.installutils import is_ipa_configured, ScriptError

2
install/restart_scripts/renew_ca_cert
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2 -E
#!/usr/bin/python3 -E
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>

2
install/restart_scripts/renew_kdc_cert
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2 -E
#!/usr/bin/python3 -E
#
# Copyright (C) 2017 FreeIPA Contributors see COPYING for license
#

2
install/restart_scripts/renew_ra_cert
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2 -E
#!/usr/bin/python3 -E
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>

2
install/restart_scripts/renew_ra_cert_pre
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2 -E
#!/usr/bin/python3 -E
#
# Copyright (C) 2015 FreeIPA Contributors see COPYING for license
#

2
install/restart_scripts/restart_dirsrv
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2 -E
#!/usr/bin/python3 -E
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>

2
install/restart_scripts/restart_httpd
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2 -E
#!/usr/bin/python3 -E
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>

2
install/restart_scripts/stop_pkicad
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2 -E
#!/usr/bin/python3 -E
#
# Authors:
# Rob Crittenden <rcritten@redhat.com>

2
install/tools/ipa-adtrust-install
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2
#!/usr/bin/python3
#
# Authors: Sumit Bose <sbose@redhat.com>
# Based on ipa-server-install by Karl MacMillan <kmacmillan@mentalrootkit.com>

2
install/tools/ipa-advise
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Tomas Babej <tbabej@redhat.com>
#
# Copyright (C) 2013 Red Hat

2
install/tools/ipa-backup
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Rob Crittenden <rcritten@redhat.com>
#
# Copyright (C) 2013 Red Hat

2
install/tools/ipa-ca-install
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Rob Crittenden <rcritten@redhat.com>
#
# Copyright (C) 2011 Red Hat

2
install/tools/ipa-cacert-manage
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Jan Cholasta <jcholast@redhat.com>
#
# Copyright (C) 2014 Red Hat

2
install/tools/ipa-compat-manage
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors: Rob Crittenden <rcritten@redhat.com>
# Authors: Simo Sorce <ssorce@redhat.com>
#

2
install/tools/ipa-csreplica-manage
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Rob Crittenden <rcritten@redhat.com>
#
# Based on ipa-replica-manage by Karl MacMillan <kmacmillan@mentalrootkit.com>

2
install/tools/ipa-custodia
View File

@ -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

2
install/tools/ipa-dns-install
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Martin Nagy <mnagy@redhat.com>
# Based on ipa-server-install by Karl MacMillan <kmacmillan@mentalrootkit.com>
#

2
install/tools/ipa-httpd-kdcproxy
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors:
# Christian Heimes <cheimes@redhat.com>
#

2
install/tools/ipa-kra-install
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Ade Lee <alee@redhat.com>
#
# Copyright (C) 2014 Red Hat

2
install/tools/ipa-ldap-updater
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors: Rob Crittenden <rcritten@redhat.com>
#
# Copyright (C) 2008 Red Hat

2
install/tools/ipa-managed-entries
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors: Jr Aquino <jr.aquino@citrix.com>
#
# Copyright (C) 2011 Red Hat

2
install/tools/ipa-nis-manage
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors: Rob Crittenden <rcritten@redhat.com>
# Authors: Simo Sorce <ssorce@redhat.com>
#

2
install/tools/ipa-otptoken-import
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Nathaniel McCallum <npmccallum@redhat.com>
#
# Copyright (C) 2014 Red Hat

2
install/tools/ipa-pki-retrieve-key
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
from __future__ import print_function

2
install/tools/ipa-pkinit-manage
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
#
# Copyright (C) 2017 FreeIPA Contributors see COPYING for license
#

2
install/tools/ipa-replica-conncheck
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Martin Kosek <mkosek@redhat.com>
#
# Copyright (C) 2011 Red Hat

2
install/tools/ipa-replica-install
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Karl MacMillan <kmacmillan@mentalrootkit.com>
#
# Copyright (C) 2007 Red Hat

2
install/tools/ipa-replica-manage
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Karl MacMillan <kmacmillan@mentalrootkit.com>
#
# Copyright (C) 2007 Red Hat

2
install/tools/ipa-replica-prepare
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Petr Viktorin <pviktori@redhat.com>
#
# Copyright (C) 2012 Red Hat

2
install/tools/ipa-restore
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Rob Crittenden <rcritten@redhat.com>
#
# Copyright (C) 2013 Red Hat

2
install/tools/ipa-server-certinstall
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Jan Cholasta <jcholast@redhat.com>
#
# Copyright (C) 2013 Red Hat

2
install/tools/ipa-server-install
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Karl MacMillan <kmacmillan@mentalrootkit.com>
# Simo Sorce <ssorce@redhat.com>
# Rob Crittenden <rcritten@redhat.com>

2
install/tools/ipa-server-upgrade
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
#
# Copyright (C) 2015 FreeIPA Contributors see COPYING for license
#

2
install/tools/ipa-winsync-migrate
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Tomas Babej <tbabej@redhat.com>
#
# Copyright (C) 2015 Red Hat

2
install/tools/ipactl
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors: Simo Sorce <ssorce@redhat.com>
#
# Copyright (C) 2008-2010 Red Hat

2
ipa
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors:
# Jason Gerard DeRose <jderose@redhat.com>

2
ipaclient/csrgen_ffi.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python
#!/usr/bin/python3
from cffi import FFI
import ctypes.util

2
ipaclient/setup.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Copyright (C) 2007 Red Hat
# see file 'COPYING' for use and warranty information
#

2
ipalib/setup.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Copyright (C) 2007 Red Hat
# see file 'COPYING' for use and warranty information
#

2
ipaplatform/setup.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Copyright (C) 2014 Red Hat
# see file 'COPYING' for use and warranty information
#

2
ipapython/setup.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Copyright (C) 2007 Red Hat
# see file 'COPYING' for use and warranty information
#

2
ipaserver/dnssec/localhsm.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
#
# Copyright (C) 2014 FreeIPA Contributors see COPYING for license
#

2
ipaserver/dnssec/odsmgr.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
#
# Copyright (C) 2014 FreeIPA Contributors see COPYING for license
#

2
ipaserver/install/ipa_kra_install.py
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2 -E
#!/usr/bin/python3 -E
# Authors: Ade Lee <alee@redhat.com>
#
# Copyright (C) 2014 Red Hat

2
ipaserver/setup.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors:
# Jason Gerard DeRose <jderose@redhat.com>

2
ipatests/i18n.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors:
# John Dennis <jdennis@redhat.com>
#

2
ipatests/ipa-run-tests
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors:
# Petr Viktorin <pviktori@redhat.com>

2
ipatests/ipa-test-config
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2
#!/usr/bin/python3
# Authors:
# Petr Viktorin <pviktori@redhat.com>

2
ipatests/ipa-test-task
View File

@ -1,4 +1,4 @@
#! /usr/bin/python2
#!/usr/bin/python3
# Authors:
# Petr Viktorin <pviktori@redhat.com>

2
ipatests/pytest_plugins/beakerlib.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Copyright (C) 2014 Red Hat
# see file 'COPYING' for use and warranty information
#

2
ipatests/setup.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Copyright (C) 2007 Red Hat
# see file 'COPYING' for use and warranty information
#

2
ipatests/test_ipapython/test_ipavalidate.py
View File

@ -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

2
makeaci
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors:
# Petr Viktorin <pviktori@redhat.com>
# John Dennis <jdennis@redhat.com>

2
makeapi
View File

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python3
# Authors:
# Rob Crittenden <rcritten@redhat.com>
# John Dennis <jdennis@redhat.com>