tests: Remove Python 2.7 glue code

Remove uses of six and from __future__ imports as they are no longer
needed.

Change-Id: I74b5250722abe1e202f31a9ec1d4cc04039df168
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39757
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/tests/configs/gpu-ruby.py b/tests/configs/gpu-ruby.py
index a463fe3b45cd1807244c02092c965b72f56e231a..b561d022818456789089b56d06c41f58ef3b8851 100644 (file)
--- a/tests/configs/gpu-ruby.py
+++ b/tests/configs/gpu-ruby.py
@@ -33,8 +33,6 @@
 #  Author: Brad Beckmann
 #
 
-from __future__ import print_function
-
 import m5
 from m5.objects import *
 from m5.defines import buildEnv

diff --git a/tests/gem5/configs/base_config.py b/tests/gem5/configs/base_config.py
index 5623db8bee8c5109372ab440b099b9f18ea0657b..b18cecfdf64c5094cdb6126e9fd149ad8857230b 100644 (file)
--- a/tests/gem5/configs/base_config.py
+++ b/tests/gem5/configs/base_config.py
@@ -42,12 +42,10 @@ from common import FSConfig
 from common import Options
 from common.Caches import *
 from ruby import Ruby
-from six import add_metaclass
 
 _have_kvm_support = 'BaseKvmCPU' in globals()
 
-@add_metaclass(ABCMeta)
-class BaseSystem(object):
+class BaseSystem(object, metaclass=ABCMeta):
     """Base system builder.
 
     This class provides some basic functionality for creating an ARM

diff --git a/tests/gem5/configs/checkpoint.py b/tests/gem5/configs/checkpoint.py
index a652094dcb3459040462d645bdc94227e8cdac3c..3545095817fd2e50ece559837368806d3d9d9e72 100644 (file)
--- a/tests/gem5/configs/checkpoint.py
+++ b/tests/gem5/configs/checkpoint.py
@@ -33,8 +33,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 from multiprocessing import Process
 import sys
 import os

diff --git a/tests/gem5/configs/switcheroo.py b/tests/gem5/configs/switcheroo.py
index cb47f90421d0a7946e62f795b1c2ac42a8821d59..fb1db813225a3b137044823499f9896a8a6e5667 100644 (file)
--- a/tests/gem5/configs/switcheroo.py
+++ b/tests/gem5/configs/switcheroo.py
@@ -33,8 +33,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 import m5
 import _m5
 from m5.objects import *

diff --git a/tests/gem5/fixture.py b/tests/gem5/fixture.py
index 467eb4303330f5ced9241d693f2cea0380baac6f..5ffb2482adec10dbfe6e46173c574a314ae10473 100644 (file)
--- a/tests/gem5/fixture.py
+++ b/tests/gem5/fixture.py
@@ -44,7 +44,8 @@ import socket
 import threading
 import gzip
 
-from six.moves import urllib
+import urllib.error
+import urllib.request
 
 from testlib.fixture import Fixture
 from testlib.configuration import config, constants

diff --git a/tests/gem5/fs/linux/arm/run.py b/tests/gem5/fs/linux/arm/run.py
index a0d782bcd46cb3d25542a4de75cc2efef20a44ca..3dccebb8ac9fa0e3913d693cb5b8d7a5cf3f7d4c 100644 (file)
--- a/tests/gem5/fs/linux/arm/run.py
+++ b/tests/gem5/fs/linux/arm/run.py
@@ -36,8 +36,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 import sys
 import os
 import os.path

diff --git a/tests/gem5/memory/test.py b/tests/gem5/memory/test.py
index 7b839f2fefe09671b667a26f19cc4a2b80141953..db20ab586a2a8c054af2746a703f767d7b50700d 100644 (file)
--- a/tests/gem5/memory/test.py
+++ b/tests/gem5/memory/test.py
@@ -28,7 +28,6 @@
 Test file for simple memory test
 TODO: Add stats checking
 '''
-import six
 
 from testlib import *
 
@@ -50,7 +49,7 @@ simple_mem_params = [
 
 
 for name, params in simple_mem_params:
-    args = ['--' + key + '=' + val for key,val in six.iteritems(params)]
+    args = ['--' + key + '=' + val for key,val in params.items()]
 
     gem5_verify_config(
         name='simple_mem_' + name,

diff --git a/tests/main.py b/tests/main.py
index 3287ef14c49b8959b688564a7b4272a5e1307878..39717f661261ba383e87688a89202170d00c046b 100755 (executable)
--- a/tests/main.py
+++ b/tests/main.py
@@ -5,7 +5,6 @@ loaders.
 
 Discovers and runs all tests from a given root directory.
 '''
-from __future__ import print_function
 
 import sys
 import os

diff --git a/tests/run.py b/tests/run.py
index a8b612b9e862890ebbd5df8d194a51a3a3975418..c3360acbd446041cf73f4ebc1de322688df8bb77 100644 (file)
--- a/tests/run.py
+++ b/tests/run.py
@@ -36,8 +36,6 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import print_function
-
 import os
 import sys
 import re