Andreas Sandberg has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/39756 )
Change subject: util: Remove Python 2.7 glue code
......................................................................
util: Remove Python 2.7 glue code
Remove uses of six and from __future__ imports as they are no longer
needed.
Change-Id: I8d6aae84d8192b301d541b8dc81275f4932f9f2f
Signed-off-by: Andreas Sandberg <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39756
Reviewed-by: Gabe Black <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
Tested-by: kokoro <[email protected]>
---
M util/build_cross_gcc/build_cross_gcc.py
M util/cpt_upgrader.py
M util/style/verifiers.py
3 files changed, 8 insertions(+), 18 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Gabe Black: Looks good to me, approved
Andreas Sandberg: Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/build_cross_gcc/build_cross_gcc.py
b/util/build_cross_gcc/build_cross_gcc.py
index 51f7fcc..3afd4bf 100755
--- a/util/build_cross_gcc/build_cross_gcc.py
+++ b/util/build_cross_gcc/build_cross_gcc.py
@@ -32,7 +32,6 @@
import os.path
import pickle
import shutil
-import six
import subprocess
import textwrap
@@ -145,9 +144,9 @@
# Settings.
#
-class MetaSetting(type):
+class MetaSetting(abc.ABCMeta):
def __new__(mcls, name, bases, d):
- cls = super(MetaSetting, mcls).__new__(mcls, name, bases, d)
+ cls = super().__new__(mcls, name, bases, d)
key = d.get('key', None)
if key is not None:
assert('default' in d)
@@ -157,9 +156,7 @@
all_settings[key] = instance
return cls
[email protected]_metaclass(MetaSetting)
[email protected]_metaclass(abc.ABCMeta)
-class Setting(object):
+class Setting(object, metaclass=MetaSetting):
key = None
@abc.abstractmethod
@@ -420,17 +417,15 @@
# Steps of the build process.
#
-class MetaStep(type):
+class MetaStep(abc.ABCMeta):
def __new__(mcls, name, bases, d):
- cls = super(MetaStep, mcls).__new__(mcls, name, bases, d)
+ cls = super().__new__(mcls, name, bases, d)
number = d.get('number', None)
if number is not None:
all_steps[number] = cls()
return cls
[email protected]_metaclass(MetaStep)
[email protected]_metaclass(abc.ABCMeta)
-class Step(object):
+class Step(object, metaclass=MetaStep):
'Steps to set up a cross compiling gcc.'
number = None
diff --git a/util/cpt_upgrader.py b/util/cpt_upgrader.py
index 9964aac..15dc2ab 100755
--- a/util/cpt_upgrader.py
+++ b/util/cpt_upgrader.py
@@ -69,8 +69,7 @@
# upgraders in private branches.
-
-from six.moves import configparser
+import configparser
import glob, types, sys, os
import os.path as osp
diff --git a/util/style/verifiers.py b/util/style/verifiers.py
index 7d27fda..798ddfc 100644
--- a/util/style/verifiers.py
+++ b/util/style/verifiers.py
@@ -47,8 +47,6 @@
import re
import sys
-from six import add_metaclass
-
from . import style
from . import sort_includes
from .region import *
@@ -102,8 +100,7 @@
return regions
-@add_metaclass(ABCMeta)
-class Verifier(object):
+class Verifier(object, metaclass=ABCMeta):
"""Base class for style verifiers
Verifiers check for style violations and optionally fix such
@@ -224,7 +221,6 @@
"""
pass
-@add_metaclass(ABCMeta)
class LineVerifier(Verifier):
def check(self, filename, regions=all_regions, fobj=None,
silent=False):
close = False
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39756
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I8d6aae84d8192b301d541b8dc81275f4932f9f2f
Gerrit-Change-Number: 39756
Gerrit-PatchSet: 2
Gerrit-Owner: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
