[RFC] Switch to Python 3 by default

[RFC] Switch to Python 3 by default

[Petr Lautrbach]

Default instalation seems to be inconsistent a little when PYTHON
variable is not used during build. Python 2 versions of selinux and
semanage modules are built and installed, but /usr/sbin/semanage and
other tools are already changed to use /usr/bin/python3.

I'd like to propose to change to Python 3 by default and leave it on a
maintainer to use PYTHON=/usr/bin/python2 when they doesn't have Python
3 available. They would also need to change shebangs of some tools, but
this is the same situation as used to be when default was Python 2 and
maintainers needed to change shebangs to /usr/bin/python3.

Do you have any objections?

[PATCH 1/3] Always use /usr/bin/python3 in Python scripts

[Petr Lautrbach]

Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
---
 dbus/selinux_server.py                   | 2 +-
 libsemanage/utils/semanage_migrate_store | 2 +-
 mcstrans/share/util/mlscolor-test        | 2 +-
 mcstrans/share/util/mlstrans-test        | 2 +-
 python/semanage/semanage                 | 2 +-
 sandbox/start                            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dbus/selinux_server.py b/dbus/selinux_server.py
index 6e380e58..98ab53dd 100644
--- a/dbus/selinux_server.py
+++ b/dbus/selinux_server.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import dbus
 import dbus.service
diff --git a/libsemanage/utils/semanage_migrate_store b/libsemanage/utils/semanage_migrate_store
index 018b1a3e..c6caf3bf 100755
--- a/libsemanage/utils/semanage_migrate_store
+++ b/libsemanage/utils/semanage_migrate_store
@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python3 -E
 
 
 from __future__ import print_function
diff --git a/mcstrans/share/util/mlscolor-test b/mcstrans/share/util/mlscolor-test
index 03fc4be4..240e996d 100644
--- a/mcstrans/share/util/mlscolor-test
+++ b/mcstrans/share/util/mlscolor-test
@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python3 -E
 import sys
 import selinux
 
diff --git a/mcstrans/share/util/mlstrans-test b/mcstrans/share/util/mlstrans-test
index c026d00e..085fa82d 100644
--- a/mcstrans/share/util/mlstrans-test
+++ b/mcstrans/share/util/mlstrans-test
@@ -1,4 +1,4 @@
-#!/usr/bin/python -E
+#!/usr/bin/python3 -E
 import sys
 import selinux
 
diff --git a/python/semanage/semanage b/python/semanage/semanage
index d6d68248..144cc000 100644
--- a/python/semanage/semanage
+++ b/python/semanage/semanage
@@ -1,4 +1,4 @@
-#! /usr/bin/python3 -Es
+#!/usr/bin/python3 -Es
 # Copyright (C) 2012-2013 Red Hat
 # AUTHOR: Miroslav Grepl <mgrepl@redhat.com>
 # AUTHOR: David Quigley <selinux@davequigley.com>
diff --git a/sandbox/start b/sandbox/start
index 7f83532f..4ed3cb5c 100644
--- a/sandbox/start
+++ b/sandbox/start
@@ -1,4 +1,4 @@
-#! /usr/bin/python -Es
+#!/usr/bin/python3 -Es
 try:
     from subprocess import getstatusoutput
 except ImportError:
-- 
2.20.1

Re: [PATCH 1/3] Always use /usr/bin/python3 in Python scripts

[Nicolas Iooss]

On Wed, Feb 20, 2019 at 5:04 PM Petr Lautrbach <plautrba@redhat.com> wrote:
>
> Signed-off-by: Petr Lautrbach <plautrba@redhat.com>

For the 3 patches:
Acked-by: Nicolas Iooss <nicolas.iooss@m4x.org>

> ---
>  dbus/selinux_server.py                   | 2 +-
>  libsemanage/utils/semanage_migrate_store | 2 +-
>  mcstrans/share/util/mlscolor-test        | 2 +-
>  mcstrans/share/util/mlstrans-test        | 2 +-
>  python/semanage/semanage                 | 2 +-
>  sandbox/start                            | 2 +-
>  6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/dbus/selinux_server.py b/dbus/selinux_server.py
> index 6e380e58..98ab53dd 100644
> --- a/dbus/selinux_server.py
> +++ b/dbus/selinux_server.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/python3
>
>  import dbus
>  import dbus.service
> diff --git a/libsemanage/utils/semanage_migrate_store b/libsemanage/utils/semanage_migrate_store
> index 018b1a3e..c6caf3bf 100755
> --- a/libsemanage/utils/semanage_migrate_store
> +++ b/libsemanage/utils/semanage_migrate_store
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python -E
> +#!/usr/bin/python3 -E
>
>
>  from __future__ import print_function
> diff --git a/mcstrans/share/util/mlscolor-test b/mcstrans/share/util/mlscolor-test
> index 03fc4be4..240e996d 100644
> --- a/mcstrans/share/util/mlscolor-test
> +++ b/mcstrans/share/util/mlscolor-test
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python -E
> +#!/usr/bin/python3 -E
>  import sys
>  import selinux
>
> diff --git a/mcstrans/share/util/mlstrans-test b/mcstrans/share/util/mlstrans-test
> index c026d00e..085fa82d 100644
> --- a/mcstrans/share/util/mlstrans-test
> +++ b/mcstrans/share/util/mlstrans-test
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python -E
> +#!/usr/bin/python3 -E
>  import sys
>  import selinux
>
> diff --git a/python/semanage/semanage b/python/semanage/semanage
> index d6d68248..144cc000 100644
> --- a/python/semanage/semanage
> +++ b/python/semanage/semanage
> @@ -1,4 +1,4 @@
> -#! /usr/bin/python3 -Es
> +#!/usr/bin/python3 -Es
>  # Copyright (C) 2012-2013 Red Hat
>  # AUTHOR: Miroslav Grepl <mgrepl@redhat.com>
>  # AUTHOR: David Quigley <selinux@davequigley.com>
> diff --git a/sandbox/start b/sandbox/start
> index 7f83532f..4ed3cb5c 100644
> --- a/sandbox/start
> +++ b/sandbox/start
> @@ -1,4 +1,4 @@
> -#! /usr/bin/python -Es
> +#!/usr/bin/python3 -Es
>  try:
>      from subprocess import getstatusoutput
>  except ImportError:
> --
> 2.20.1
>

Re: [PATCH 1/3] Always use /usr/bin/python3 in Python scripts

[Petr Lautrbach]

Nicolas Iooss <nicolas.iooss@m4x.org> writes:

> On Wed, Feb 20, 2019 at 5:04 PM Petr Lautrbach <plautrba@redhat.com> wrote:
>>
>> Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
>
> For the 3 patches:
> Acked-by: Nicolas Iooss <nicolas.iooss@m4x.org>

Merged.

>> ---
>>  dbus/selinux_server.py                   | 2 +-
>>  libsemanage/utils/semanage_migrate_store | 2 +-
>>  mcstrans/share/util/mlscolor-test        | 2 +-
>>  mcstrans/share/util/mlstrans-test        | 2 +-
>>  python/semanage/semanage                 | 2 +-
>>  sandbox/start                            | 2 +-
>>  6 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/dbus/selinux_server.py b/dbus/selinux_server.py
>> index 6e380e58..98ab53dd 100644
>> --- a/dbus/selinux_server.py
>> +++ b/dbus/selinux_server.py
>> @@ -1,4 +1,4 @@
>> -#!/usr/bin/python
>> +#!/usr/bin/python3
>>
>>  import dbus
>>  import dbus.service
>> diff --git a/libsemanage/utils/semanage_migrate_store b/libsemanage/utils/semanage_migrate_store
>> index 018b1a3e..c6caf3bf 100755
>> --- a/libsemanage/utils/semanage_migrate_store
>> +++ b/libsemanage/utils/semanage_migrate_store
>> @@ -1,4 +1,4 @@
>> -#!/usr/bin/python -E
>> +#!/usr/bin/python3 -E
>>
>>
>>  from __future__ import print_function
>> diff --git a/mcstrans/share/util/mlscolor-test b/mcstrans/share/util/mlscolor-test
>> index 03fc4be4..240e996d 100644
>> --- a/mcstrans/share/util/mlscolor-test
>> +++ b/mcstrans/share/util/mlscolor-test
>> @@ -1,4 +1,4 @@
>> -#!/usr/bin/python -E
>> +#!/usr/bin/python3 -E
>>  import sys
>>  import selinux
>>
>> diff --git a/mcstrans/share/util/mlstrans-test b/mcstrans/share/util/mlstrans-test
>> index c026d00e..085fa82d 100644
>> --- a/mcstrans/share/util/mlstrans-test
>> +++ b/mcstrans/share/util/mlstrans-test
>> @@ -1,4 +1,4 @@
>> -#!/usr/bin/python -E
>> +#!/usr/bin/python3 -E
>>  import sys
>>  import selinux
>>
>> diff --git a/python/semanage/semanage b/python/semanage/semanage
>> index d6d68248..144cc000 100644
>> --- a/python/semanage/semanage
>> +++ b/python/semanage/semanage
>> @@ -1,4 +1,4 @@
>> -#! /usr/bin/python3 -Es
>> +#!/usr/bin/python3 -Es
>>  # Copyright (C) 2012-2013 Red Hat
>>  # AUTHOR: Miroslav Grepl <mgrepl@redhat.com>
>>  # AUTHOR: David Quigley <selinux@davequigley.com>
>> diff --git a/sandbox/start b/sandbox/start
>> index 7f83532f..4ed3cb5c 100644
>> --- a/sandbox/start
>> +++ b/sandbox/start
>> @@ -1,4 +1,4 @@
>> -#! /usr/bin/python -Es
>> +#!/usr/bin/python3 -Es
>>  try:
>>      from subprocess import getstatusoutput
>>  except ImportError:
>> --
>> 2.20.1
>>

[PATCH 2/3] Switch to python3 by default

[Petr Lautrbach]

- Python 2.7 is planned to be the last of the 2.x releases
- It's generally advised to use Python 3
- Majority of python/ scripts are already switched python3
- Users with python 2 only can still use:

$ make PYTHON=/usr/bin/python ....

Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
---
 libselinux/src/Makefile               | 2 +-
 libsemanage/src/Makefile              | 2 +-
 python/audit2allow/Makefile           | 2 +-
 python/semanage/Makefile              | 2 +-
 python/sepolgen/src/sepolgen/Makefile | 2 +-
 python/sepolgen/tests/Makefile        | 2 +-
 python/sepolicy/Makefile              | 2 +-
 sandbox/Makefile                      | 2 +-
 scripts/env_use_destdir               | 2 +-
 scripts/run-scan-build                | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libselinux/src/Makefile b/libselinux/src/Makefile
index 92e30738..e9ed0383 100644
--- a/libselinux/src/Makefile
+++ b/libselinux/src/Makefile
@@ -1,7 +1,7 @@
 # Support building the Python bindings multiple times, against various Python
 # runtimes (e.g. Python 2 vs Python 3) by optionally prefixing the build
 # targets with "PYPREFIX":
-PYTHON ?= python
+PYTHON ?= python3
 PYPREFIX ?= $(shell $(PYTHON) -c 'import sys;print("python-%d.%d" % sys.version_info[:2])')
 RUBY ?= ruby
 RUBYPREFIX ?= $(notdir $(RUBY))
diff --git a/libsemanage/src/Makefile b/libsemanage/src/Makefile
index dea751e5..e029f098 100644
--- a/libsemanage/src/Makefile
+++ b/libsemanage/src/Makefile
@@ -1,7 +1,7 @@
 # Support building the Python bindings multiple times, against various Python
 # runtimes (e.g. Python 2 vs Python 3) by optionally prefixing the build
 # targets with "PYPREFIX":
-PYTHON ?= python
+PYTHON ?= python3
 PYPREFIX ?= $(shell $(PYTHON) -c 'import sys;print("python-%d.%d" % sys.version_info[:2])')
 RUBY ?= ruby
 RUBYPREFIX ?= $(notdir $(RUBY))
diff --git a/python/audit2allow/Makefile b/python/audit2allow/Makefile
index 18d740d3..15db5490 100644
--- a/python/audit2allow/Makefile
+++ b/python/audit2allow/Makefile
@@ -1,4 +1,4 @@
-PYTHON ?= python
+PYTHON ?= python3
 SECILC ?= secilc
 
 # Installation directories.
diff --git a/python/semanage/Makefile b/python/semanage/Makefile
index 37065268..024e9640 100644
--- a/python/semanage/Makefile
+++ b/python/semanage/Makefile
@@ -1,4 +1,4 @@
-PYTHON ?= python
+PYTHON ?= python3
 
 # Installation directories.
 LINGUAS ?= ru
diff --git a/python/sepolgen/src/sepolgen/Makefile b/python/sepolgen/src/sepolgen/Makefile
index c75809ad..cac8def7 100644
--- a/python/sepolgen/src/sepolgen/Makefile
+++ b/python/sepolgen/src/sepolgen/Makefile
@@ -1,5 +1,5 @@
 PREFIX ?= /usr
-PYTHON ?= python
+PYTHON ?= python3
 PYTHONLIBDIR ?= $(shell $(PYTHON) -c "from distutils.sysconfig import *; print(get_python_lib(prefix='$(PREFIX)'))")
 PACKAGEDIR ?= /$(PYTHONLIBDIR)/sepolgen
 
diff --git a/python/sepolgen/tests/Makefile b/python/sepolgen/tests/Makefile
index e17eef22..83d072f4 100644
--- a/python/sepolgen/tests/Makefile
+++ b/python/sepolgen/tests/Makefile
@@ -1,4 +1,4 @@
-PYTHON ?= python
+PYTHON ?= python3
 
 clean:
 	rm -f *~ *.pyc
diff --git a/python/sepolicy/Makefile b/python/sepolicy/Makefile
index 7ed039bc..69f29fa9 100644
--- a/python/sepolicy/Makefile
+++ b/python/sepolicy/Makefile
@@ -1,4 +1,4 @@
-PYTHON ?= python
+PYTHON ?= python3
 
 # Installation directories.
 LINGUAS ?= ru
diff --git a/sandbox/Makefile b/sandbox/Makefile
index 862bffbe..9da5e58d 100644
--- a/sandbox/Makefile
+++ b/sandbox/Makefile
@@ -1,4 +1,4 @@
-PYTHON ?= python
+PYTHON ?= python3
 
 # Installation directories.
 LINGUAS ?= ru
diff --git a/scripts/env_use_destdir b/scripts/env_use_destdir
index 4fbfb8de..251987c2 100755
--- a/scripts/env_use_destdir
+++ b/scripts/env_use_destdir
@@ -25,7 +25,7 @@ export LD_LIBRARY_PATH="$DESTDIR/usr/lib:$DESTDIR/lib"
 export PATH="$DESTDIR/usr/sbin:$DESTDIR/usr/bin:$DESTDIR/sbin:$DESTDIR/bin:$PATH"
 
 # shellcheck disable=SC2155
-export PYTHONPATH="$DESTDIR$(${PYTHON:-python} -c "from distutils.sysconfig import *;print(get_python_lib(prefix='/usr'))")"
+export PYTHONPATH="$DESTDIR$(${PYTHON:-python3} -c "from distutils.sysconfig import *;print(get_python_lib(prefix='/usr'))")"
 
 # shellcheck disable=SC2155
 export RUBYLIB="$DESTDIR/$(${RUBY:-ruby} -e 'puts RbConfig::CONFIG["vendorlibdir"]'):$DESTDIR/$(${RUBY:-ruby} -e 'puts RbConfig::CONFIG["vendorarchdir"]')"
diff --git a/scripts/run-scan-build b/scripts/run-scan-build
index 8b24a4d0..88fe551c 100755
--- a/scripts/run-scan-build
+++ b/scripts/run-scan-build
@@ -17,7 +17,7 @@ fi
 # Make sure to use the newly-installed libraries when running tests
 export LD_LIBRARY_PATH="$DESTDIR/usr/lib:$DESTDIR/lib"
 export PATH="$DESTDIR/usr/sbin:$DESTDIR/usr/bin:$DESTDIR/sbin:$DESTDIR/bin:$PATH"
-export PYTHONPATH="$DESTDIR$(${PYTHON:-python} -c "from distutils.sysconfig import *;print(get_python_lib(prefix='/usr'))")"
+export PYTHONPATH="$DESTDIR$(${PYTHON:-python3} -c "from distutils.sysconfig import *;print(get_python_lib(prefix='/usr'))")"
 export RUBYLIB="$DESTDIR/$(${RUBY:-ruby} -e 'puts RbConfig::CONFIG["vendorlibdir"]'):$DESTDIR/$(${RUBY:-ruby} -e 'puts RbConfig::CONFIG["vendorarchdir"]')"
 
 # Build and analyze
-- 
2.20.1

[PATCH 3/3] README: Update Fedora python 3 dependencies

[Petr Lautrbach]

Signed-off-by: Petr Lautrbach <plautrba@redhat.com>
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 1c009b01..e4423ca2 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ Subscribe by sending "subscribe selinux" in the body of an email
 to majordomo@vger.kernel.org.
 
 Build dependencies on Fedora:
-yum install audit-libs-devel bison bzip2-devel dbus-devel dbus-glib-devel flex flex-devel flex-static glib2-devel libcap-devel libcap-ng-devel pam-devel pcre-devel python-devel setools-devel swig xmlto redhat-rpm-config
+yum install audit-libs-devel bison bzip2-devel dbus-devel dbus-glib-devel flex flex-devel flex-static glib2-devel libcap-devel libcap-ng-devel pam-devel pcre-devel python3-devel python3-setools swig xmlto redhat-rpm-config
 
 To build and install everything under a private directory, run:
 make DESTDIR=~/obj install install-pywrap
-- 
2.20.1

Re: [RFC] Switch to Python 3 by default

[Stephen Smalley]

On Wed, Feb 20, 2019 at 11:05 AM Petr Lautrbach <plautrba@redhat.com> wrote:
>
>
> Default instalation seems to be inconsistent a little when PYTHON
> variable is not used during build. Python 2 versions of selinux and
> semanage modules are built and installed, but /usr/sbin/semanage and
> other tools are already changed to use /usr/bin/python3.
>
> I'd like to propose to change to Python 3 by default and leave it on a
> maintainer to use PYTHON=/usr/bin/python2 when they doesn't have Python
> 3 available. They would also need to change shebangs of some tools, but
> this is the same situation as used to be when default was Python 2 and
> maintainers needed to change shebangs to /usr/bin/python3.
>
> Do you have any objections?

Sounds good to me.

Re: [RFC] Switch to Python 3 by default

[Nicolas Iooss]

On Wed, Feb 20, 2019 at 10:18 PM Stephen Smalley
<stephen.smalley@gmail.com> wrote:
>
> On Wed, Feb 20, 2019 at 11:05 AM Petr Lautrbach <plautrba@redhat.com> wrote:
> >
> >
> > Default instalation seems to be inconsistent a little when PYTHON
> > variable is not used during build. Python 2 versions of selinux and
> > semanage modules are built and installed, but /usr/sbin/semanage and
> > other tools are already changed to use /usr/bin/python3.
> >
> > I'd like to propose to change to Python 3 by default and leave it on a
> > maintainer to use PYTHON=/usr/bin/python2 when they doesn't have Python
> > 3 available. They would also need to change shebangs of some tools, but
> > this is the same situation as used to be when default was Python 2 and
> > maintainers needed to change shebangs to /usr/bin/python3.
> >
> > Do you have any objections?
>
> Sounds good to me.

I agree.

Cheers,
Nicolas