diff options
| author | Martin Pitt <martin.pitt@ubuntu.com> | 2016-11-28 21:10:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-28 21:10:57 +0100 |
| commit | 920ec31b5ffeb8695bef68e0dc082c0fc22965d3 (patch) | |
| tree | 9945676831fe3d47022ab6e8c4844768ea0ee529 | |
| parent | b76d99d9e66f965b79dade55ab719d54a17e709c (diff) | |
| parent | b95f5528cc7e84327966308ea8e29d5920048cda (diff) | |
Merge pull request #4761 from fsateler/python3
Explicitly use python3 everywhere
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | src/journal-remote/log-generator.py | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | test/rule-syntax-check.py | 1 | ||||
| -rwxr-xr-x | test/sysv-generator-test.py | 2 | ||||
| -rw-r--r-- | tools/gdb-sd_dump_hashmaps.py | 1 | ||||
| -rwxr-xr-x | tools/make-directive-index.py | 1 | ||||
| -rwxr-xr-x | tools/make-man-index.py | 1 | ||||
| -rw-r--r-- | tools/make-man-rules.py | 1 | ||||
| -rw-r--r-- | tools/xml_helper.py | 1 |
9 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 5979de4dc6..32febcabe9 100644 --- a/configure.ac +++ b/configure.ac @@ -263,7 +263,7 @@ AC_ARG_WITH([python], have_lxml=no AS_IF([test "x$with_python" != "xno"], [ - AM_PATH_PYTHON(,, [:]) + AM_PATH_PYTHON([3],, [:]) AS_IF([test "x$PYTHON" != "x:"], [ AC_MSG_CHECKING([for python lxml module]) AS_IF(["$PYTHON" -c 'import lxml' 2>/dev/null], [have_lxml=yes]) diff --git a/src/journal-remote/log-generator.py b/src/journal-remote/log-generator.py index fd6964e758..24874e960c 100755 --- a/src/journal-remote/log-generator.py +++ b/src/journal-remote/log-generator.py @@ -1,5 +1,4 @@ -#!/usr/bin/python -from __future__ import print_function +#!/usr/bin/python3 import sys import argparse diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py index e43a3daeb3..e4185cb0fa 100644..100755 --- a/test/rule-syntax-check.py +++ b/test/rule-syntax-check.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # Simple udev rules syntax checker # # (C) 2010 Canonical Ltd. diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py index 838dd57a6f..50175485f7 100755 --- a/test/sysv-generator-test.py +++ b/test/sysv-generator-test.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # systemd-sysv-generator integration test # diff --git a/tools/gdb-sd_dump_hashmaps.py b/tools/gdb-sd_dump_hashmaps.py index 9ee81fb05a..d20016e005 100644 --- a/tools/gdb-sd_dump_hashmaps.py +++ b/tools/gdb-sd_dump_hashmaps.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */ # # This file is part of systemd. diff --git a/tools/make-directive-index.py b/tools/make-directive-index.py index 256ff3dc5d..8ce09ca2fa 100755 --- a/tools/make-directive-index.py +++ b/tools/make-directive-index.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */ # # This file is part of systemd. diff --git a/tools/make-man-index.py b/tools/make-man-index.py index 74a47b821a..50ad9532cd 100755 --- a/tools/make-man-index.py +++ b/tools/make-man-index.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */ # # This file is part of systemd. diff --git a/tools/make-man-rules.py b/tools/make-man-rules.py index 5e61917d60..18aa513952 100644 --- a/tools/make-man-rules.py +++ b/tools/make-man-rules.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */ # # This file is part of systemd. diff --git a/tools/xml_helper.py b/tools/xml_helper.py index e87126f2f7..b2c036909d 100644 --- a/tools/xml_helper.py +++ b/tools/xml_helper.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # -*- Mode: python; coding: utf-8; indent-tabs-mode: nil -*- */ # # This file is part of systemd. |