From 1c4a885e27cd950e4b5cf24799cbba51225e2ef0 Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sat, 1 Oct 2016 20:57:09 +0200 Subject: [PATCH] Switch utils to python3 As discussed a while ago, switch the utils (including their tests) to use python3 by default. While on it, drop usage of "env" to always get the system python3 instead of a random one that happens to live somewhere in $PATH. In practise, this patch doesn't change much - AFAIK openSUSE, Debian and Ubuntu already patch aa-* to use python3. Also add a note to README to officially deprecate Python 2.x. (I won't break Python 2.x support intentionally - unless some future change gives me a very good reason to finally drop Python 2.x support.) Acked-by: Seth Arnold (since 2016-08-23, but the commit had to wait for the FileRule series because it touches test-file.py) --- README | 3 ++- utils/aa-audit | 2 +- utils/aa-autodep | 2 +- utils/aa-cleanprof | 2 +- utils/aa-complain | 2 +- utils/aa-disable | 2 +- utils/aa-easyprof | 2 +- utils/aa-enforce | 2 +- utils/aa-genprof | 2 +- utils/aa-logprof | 2 +- utils/aa-mergeprof | 2 +- utils/aa-sandbox | 2 +- utils/aa-status | 2 +- utils/aa-unconfined | 2 +- utils/test/test-aa-decode.py | 2 +- utils/test/test-aa-easyprof.py | 2 +- utils/test/test-aa.py | 2 +- utils/test/test-aamode.py | 2 +- utils/test/test-aare.py | 2 +- utils/test/test-baserule.py | 2 +- utils/test/test-capability.py | 2 +- utils/test/test-change_profile.py | 2 +- utils/test/test-common.py | 2 +- utils/test/test-dbus.py | 2 +- utils/test/test-example.py | 2 +- utils/test/test-file.py | 2 +- utils/test/test-libapparmor-test_multi.py | 2 +- utils/test/test-mount_parse.py | 2 +- utils/test/test-network.py | 2 +- utils/test/test-parser-simple-tests.py | 2 +- utils/test/test-pivot_root_parse.py | 2 +- utils/test/test-ptrace.py | 2 +- utils/test/test-regex_matches.py | 2 +- utils/test/test-rlimit.py | 2 +- utils/test/test-severity.py | 2 +- utils/test/test-signal.py | 2 +- utils/test/test-translations.py | 2 +- utils/test/test-unix_parse.py | 2 +- 38 files changed, 39 insertions(+), 38 deletions(-) diff --git a/README b/README index b6264da13..54bc47f8d 100644 --- a/README +++ b/README @@ -232,7 +232,8 @@ The AppArmor userspace utilities are written with some assumptions about installed and available versions of other tools. This is a (possibly incomplete) list of known version dependencies: -The Python utilities require a minimum of Python 2.7 or Python 3.3. +The Python utilities require a minimum of Python 2.7 (deprecated) or Python 3.3. +Python 3.x is recommended. Python 2.x support is deprecated since AppArmor 2.11. Some utilities (aa-exec, aa-notify and aa-decode) require Perl 5.10.1 or newer. diff --git a/utils/aa-audit b/utils/aa-audit index 885c663bf..eee559a22 100755 --- a/utils/aa-audit +++ b/utils/aa-audit @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2013 Kshitij Gupta # diff --git a/utils/aa-autodep b/utils/aa-autodep index 331dc5348..6126acce7 100755 --- a/utils/aa-autodep +++ b/utils/aa-autodep @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2013 Kshitij Gupta # diff --git a/utils/aa-cleanprof b/utils/aa-cleanprof index 585479f29..84f9462b8 100755 --- a/utils/aa-cleanprof +++ b/utils/aa-cleanprof @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2013 Kshitij Gupta # diff --git a/utils/aa-complain b/utils/aa-complain index 0cf19c5f2..c0abd1919 100755 --- a/utils/aa-complain +++ b/utils/aa-complain @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2013 Kshitij Gupta # diff --git a/utils/aa-disable b/utils/aa-disable index 49624d21d..647a723dd 100755 --- a/utils/aa-disable +++ b/utils/aa-disable @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2013 Kshitij Gupta # diff --git a/utils/aa-easyprof b/utils/aa-easyprof index 88d1f92f9..9c59359ac 100755 --- a/utils/aa-easyprof +++ b/utils/aa-easyprof @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2011-2015 Canonical Ltd. diff --git a/utils/aa-enforce b/utils/aa-enforce index ff1e7f402..7f79854f6 100755 --- a/utils/aa-enforce +++ b/utils/aa-enforce @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2013 Kshitij Gupta # diff --git a/utils/aa-genprof b/utils/aa-genprof index 5a89b17bc..3fe72bbb7 100755 --- a/utils/aa-genprof +++ b/utils/aa-genprof @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2013 Kshitij Gupta # diff --git a/utils/aa-logprof b/utils/aa-logprof index 5d3cb3f84..05ebbd9b9 100755 --- a/utils/aa-logprof +++ b/utils/aa-logprof @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2013 Kshitij Gupta # diff --git a/utils/aa-mergeprof b/utils/aa-mergeprof index a9a5ea743..763958ba0 100755 --- a/utils/aa-mergeprof +++ b/utils/aa-mergeprof @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2013 Kshitij Gupta # Copyright (C) 2014-2016 Christian Boltz diff --git a/utils/aa-sandbox b/utils/aa-sandbox index b10896e72..8a7e0e82b 100755 --- a/utils/aa-sandbox +++ b/utils/aa-sandbox @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2012 Canonical Ltd. diff --git a/utils/aa-status b/utils/aa-status index b6f676077..1c5ed3c9d 100755 --- a/utils/aa-status +++ b/utils/aa-status @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2005-2006 Novell/SUSE diff --git a/utils/aa-unconfined b/utils/aa-unconfined index 55c113614..ce441e095 100755 --- a/utils/aa-unconfined +++ b/utils/aa-unconfined @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2013 Kshitij Gupta # diff --git a/utils/test/test-aa-decode.py b/utils/test/test-aa-decode.py index ffe29fe34..a7a1bb5b5 100755 --- a/utils/test/test-aa-decode.py +++ b/utils/test/test-aa-decode.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2011-2012 Canonical Ltd. diff --git a/utils/test/test-aa-easyprof.py b/utils/test/test-aa-easyprof.py index e1e1a1db7..5cc1f791f 100755 --- a/utils/test/test-aa-easyprof.py +++ b/utils/test/test-aa-easyprof.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2011-2015 Canonical Ltd. diff --git a/utils/test/test-aa.py b/utils/test/test-aa.py index a1f14cab7..de4a5f341 100644 --- a/utils/test/test-aa.py +++ b/utils/test/test-aa.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2014-2015 Christian Boltz diff --git a/utils/test/test-aamode.py b/utils/test/test-aamode.py index 76db9ca5a..213e0f9cc 100644 --- a/utils/test/test-aamode.py +++ b/utils/test/test-aamode.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2014 Christian Boltz diff --git a/utils/test/test-aare.py b/utils/test/test-aare.py index a1c2a7b49..94592df39 100644 --- a/utils/test/test-aare.py +++ b/utils/test/test-aare.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2013 Kshitij Gupta diff --git a/utils/test/test-baserule.py b/utils/test/test-baserule.py index f02f820ee..865d21b25 100644 --- a/utils/test/test-baserule.py +++ b/utils/test/test-baserule.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2015 Christian Boltz diff --git a/utils/test/test-capability.py b/utils/test/test-capability.py index ee39d8c9d..4689b1cca 100644 --- a/utils/test/test-capability.py +++ b/utils/test/test-capability.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2014 Christian Boltz # diff --git a/utils/test/test-change_profile.py b/utils/test/test-change_profile.py index 32a684c39..1318a827f 100644 --- a/utils/test/test-change_profile.py +++ b/utils/test/test-change_profile.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2015 Christian Boltz # diff --git a/utils/test/test-common.py b/utils/test/test-common.py index 372cf0259..72ba2e0a3 100644 --- a/utils/test/test-common.py +++ b/utils/test/test-common.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2015 Christian Boltz diff --git a/utils/test/test-dbus.py b/utils/test/test-dbus.py index c415728b3..43c2f8935 100644 --- a/utils/test/test-dbus.py +++ b/utils/test/test-dbus.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2015 Christian Boltz # diff --git a/utils/test/test-example.py b/utils/test/test-example.py index a744bff99..b90b0775d 100644 --- a/utils/test/test-example.py +++ b/utils/test/test-example.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2015 Christian Boltz diff --git a/utils/test/test-file.py b/utils/test/test-file.py index 19842a18b..f497be81d 100644 --- a/utils/test/test-file.py +++ b/utils/test/test-file.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2015 Christian Boltz # diff --git a/utils/test/test-libapparmor-test_multi.py b/utils/test/test-libapparmor-test_multi.py index 440131c12..c06b12221 100644 --- a/utils/test/test-libapparmor-test_multi.py +++ b/utils/test/test-libapparmor-test_multi.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2015 Christian Boltz diff --git a/utils/test/test-mount_parse.py b/utils/test/test-mount_parse.py index edba87eb9..3f08fc226 100644 --- a/utils/test/test-mount_parse.py +++ b/utils/test/test-mount_parse.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2014 Canonical Ltd. diff --git a/utils/test/test-network.py b/utils/test/test-network.py index 2f2b87f02..a00f7229e 100644 --- a/utils/test/test-network.py +++ b/utils/test/test-network.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2015 Christian Boltz # diff --git a/utils/test/test-parser-simple-tests.py b/utils/test/test-parser-simple-tests.py index 850de4fe1..11617b5aa 100644 --- a/utils/test/test-parser-simple-tests.py +++ b/utils/test/test-parser-simple-tests.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2015 Christian Boltz diff --git a/utils/test/test-pivot_root_parse.py b/utils/test/test-pivot_root_parse.py index 0422f657a..fa4840bbf 100644 --- a/utils/test/test-pivot_root_parse.py +++ b/utils/test/test-pivot_root_parse.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2014 Canonical Ltd. diff --git a/utils/test/test-ptrace.py b/utils/test/test-ptrace.py index 346670b41..0c1e09181 100644 --- a/utils/test/test-ptrace.py +++ b/utils/test/test-ptrace.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2015 Christian Boltz # diff --git a/utils/test/test-regex_matches.py b/utils/test/test-regex_matches.py index 2c38cf391..9abbe5b4a 100644 --- a/utils/test/test-regex_matches.py +++ b/utils/test/test-regex_matches.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2014 Canonical Ltd. diff --git a/utils/test/test-rlimit.py b/utils/test/test-rlimit.py index 86d9cf641..d6ce6e473 100644 --- a/utils/test/test-rlimit.py +++ b/utils/test/test-rlimit.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2015 Christian Boltz # diff --git a/utils/test/test-severity.py b/utils/test/test-severity.py index 6bad350fa..87bc5b140 100755 --- a/utils/test/test-severity.py +++ b/utils/test/test-severity.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2013 Kshitij Gupta # Copyright (C) 2014 Canonical, Ltd. diff --git a/utils/test/test-signal.py b/utils/test/test-signal.py index 73ef10358..ca94ebb4e 100644 --- a/utils/test/test-signal.py +++ b/utils/test/test-signal.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # ---------------------------------------------------------------------- # Copyright (C) 2015 Christian Boltz # diff --git a/utils/test/test-translations.py b/utils/test/test-translations.py index 0ddd8a484..591f3ee56 100644 --- a/utils/test/test-translations.py +++ b/utils/test/test-translations.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2016 Christian Boltz diff --git a/utils/test/test-unix_parse.py b/utils/test/test-unix_parse.py index 3f97bd476..be7056f30 100644 --- a/utils/test/test-unix_parse.py +++ b/utils/test/test-unix_parse.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#! /usr/bin/python3 # ------------------------------------------------------------------ # # Copyright (C) 2014 Canonical Ltd.