diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2015-01-28 16:10:12 +0100 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-02-13 18:36:50 +0100 |
| commit | d0a95d87f41721bb57149471897cc920a8730c20 (patch) | |
| tree | 1483c49484f212b6c07b8b82491a9d5682aadbf3 | |
| parent | af8e9134176b4517ecfdd2e10e6204fd3f0ad765 (diff) | |
| download | sssd-d0a95d87f41721bb57149471897cc920a8730c20.tar.gz sssd-d0a95d87f41721bb57149471897cc920a8730c20.tar.xz sssd-d0a95d87f41721bb57149471897cc920a8730c20.zip | |
Remove strict requirements of python2
* fix hashbangs
* remove strict requirements of python2 in build system
Resolves:
https://fedorahosted.org/sssd/ticket/2017
Reviewed-by: Petr Viktorin <pviktori@redhat.com>
(cherry picked from commit e8058322725ba050014777ee2484f7e833ab1e3a)
| -rw-r--r-- | configure.ac | 1 | ||||
| -rwxr-xr-x | src/config/SSSDConfigTest.py | 2 | ||||
| -rw-r--r-- | src/external/python.m4 | 2 | ||||
| -rwxr-xr-x | src/sbus/sbus_codegen | 2 | ||||
| -rwxr-xr-x | src/tests/pyhbac-test.py | 2 | ||||
| -rwxr-xr-x | src/tests/pysss_murmur-test.py | 2 | ||||
| -rw-r--r-- | src/tests/python-test.py | 2 | ||||
| -rw-r--r-- | src/tools/sss_obfuscate | 2 |
8 files changed, 7 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index dd64df3d9..dbecd330e 100644 --- a/configure.ac +++ b/configure.ac @@ -249,7 +249,6 @@ AM_CONDITIONAL([HAVE_MANPAGES], [test "x$HAVE_MANPAGES" != "x"]) AM_CONDITIONAL([HAVE_PO4A], [test "x$PO4A" != "xno"]) if test x$HAVE_PYTHON_BINDINGS != x; then - PYTHON=python2 AM_PATH_PYTHON([2.4]) AM_CHECK_PYTHON_HEADERS([], AC_MSG_ERROR([Could not find python headers])) diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py index 865079fea..3a5312ea9 100755 --- a/src/config/SSSDConfigTest.py +++ b/src/config/SSSDConfigTest.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python ''' Created on Sep 18, 2009 diff --git a/src/external/python.m4 b/src/external/python.m4 index 25fc7f397..a1bd87a0e 100644 --- a/src/external/python.m4 +++ b/src/external/python.m4 @@ -9,7 +9,7 @@ AC_DEFUN([AM_PYTHON_CONFIG], dnl We need to check for python build flags using distutils.sysconfig dnl We cannot use python-config, as it was not available on older dnl versions of python - AC_PATH_PROG(PYTHON, python2) + AC_PATH_PROG(PYTHON, python) AC_MSG_CHECKING([for working python]) if test -x "$PYTHON"; then PYTHON_CFLAGS="`$PYTHON -c \"from distutils import sysconfig; \ diff --git a/src/sbus/sbus_codegen b/src/sbus/sbus_codegen index b4e63f33e..6a96c40f5 100755 --- a/src/sbus/sbus_codegen +++ b/src/sbus/sbus_codegen @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # # Authors: diff --git a/src/tests/pyhbac-test.py b/src/tests/pyhbac-test.py index b7f27026b..0abc5703d 100755 --- a/src/tests/pyhbac-test.py +++ b/src/tests/pyhbac-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python from __future__ import print_function import unittest diff --git a/src/tests/pysss_murmur-test.py b/src/tests/pysss_murmur-test.py index 41cb350f7..0b28f45e6 100755 --- a/src/tests/pysss_murmur-test.py +++ b/src/tests/pysss_murmur-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python # SSSD # # Unit tests for pysss_murmur diff --git a/src/tests/python-test.py b/src/tests/python-test.py index 9967d1b5f..08ac5973f 100644 --- a/src/tests/python-test.py +++ b/src/tests/python-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/env python #coding=utf-8 # Authors: diff --git a/src/tools/sss_obfuscate b/src/tools/sss_obfuscate index 86e7daa1f..fbea1213d 100644 --- a/src/tools/sss_obfuscate +++ b/src/tools/sss_obfuscate @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python import sys from optparse import OptionParser |