Merge ~fginther/qa-regression-testing:python2to3 into qa-regression-testing:master

[Francis Ginther]

Apply python 2to3 conversion on errno-read.py and maps-protection.py

Convert these two scripts to execute with python3 now that python2 has
been removed from lunar.

Signed-off-by: Francis Ginther <email address hidden>

[Steve Beattie (sbeattie)]

Hey Francis,

On Thu, Apr 06, 2023 at 01:30:18PM -0000, Francis Ginther wrote:
> Francis Ginther has proposed merging ~fginther/qa-regression-testing:python2to3 into qa-regression-testing:master.
>
> Commit message:
> Apply python 2to3 conversion on errno-read.py and maps-protection.py

I think this looks fine to me, but do the kernel test environments
in 14.04 ESM trusty get python3 installed in them? I forget which
release we started installing python3 by default.

Thanks!

--
Steve Beattie
<email address hidden>

[Francis Ginther (fginther)]

Steve,

Thanks for the review. I've checked that our kernel test environments do have python3 (3.4 is seeded into the cloud images [1]). I've also verified that the two tests that led to this change, test_010_proc_maps and test_032_dev_kmem, now pass on both lunar and trusty.

[1] - https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64.manifest

[Steve Beattie (sbeattie)]

Excellent, thanks, merging.

review: Approve

diff --git a/scripts/kernel-security/errno-read.py b/scripts/kernel-security/errno-read.py
index 8e31c38..8161f08 100755
--- a/scripts/kernel-security/errno-read.py
+++ b/scripts/kernel-security/errno-read.py
@@ -1,5 +1,5 @@
-#!/usr/bin/env python2
-from __future__ import print_function
+#!/usr/bin/env python3
+
 import sys
 try:
     f = open(sys.argv[1])
diff --git a/scripts/kernel-security/proc-maps/maps-protection.py b/scripts/kernel-security/proc-maps/maps-protection.py
index 6cbcf57..2df9882 100755
--- a/scripts/kernel-security/proc-maps/maps-protection.py
+++ b/scripts/kernel-security/proc-maps/maps-protection.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 #
 # This verifies that memory-segment listing /proc files (maps, smaps) are
 # not world-readable, and that setuid priv-dropped process can still read
@@ -9,7 +9,7 @@
 # Copyright (C) 2008, 2013 Canonical, Ltd.
 # Author: Kees Cook <[e-mail]>
 # License: GPLv3
-from __future__ import print_function
+
 
 import errno
 import os