misc,python: Run pre-commit run --all-files
Applies the `pyupgrade` hook to all files in the repo. Change-Id: I9879c634a65c5fcaa9567c63bc5977ff97d5d3bf
This commit is contained in:
@@ -42,7 +42,7 @@ import sys
|
||||
from textwrap import TextWrapper
|
||||
|
||||
|
||||
class ObjectList(object):
|
||||
class ObjectList:
|
||||
"""Creates a list of objects that are sub-classes of a given class."""
|
||||
|
||||
def _is_obj_class(self, cls):
|
||||
@@ -86,7 +86,7 @@ class ObjectList(object):
|
||||
print(line)
|
||||
|
||||
if self._aliases:
|
||||
print("\Aliases:")
|
||||
print(r"\Aliases:")
|
||||
for alias, target in list(self._aliases.items()):
|
||||
print(f"\t{alias} => {target}")
|
||||
|
||||
@@ -127,14 +127,14 @@ class CPUList(ObjectList):
|
||||
# We can't use the normal inspect.isclass because the ParamFactory
|
||||
# and ProxyFactory classes have a tendency to confuse it.
|
||||
try:
|
||||
return super(CPUList, self)._is_obj_class(cls) and not issubclass(
|
||||
return super()._is_obj_class(cls) and not issubclass(
|
||||
cls, m5.objects.CheckerCPU
|
||||
)
|
||||
except (TypeError, AttributeError):
|
||||
return False
|
||||
|
||||
def _add_objects(self):
|
||||
super(CPUList, self)._add_objects()
|
||||
super()._add_objects()
|
||||
|
||||
from importlib import import_module
|
||||
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright (c) 2015 Jason Power
|
||||
# All rights reserved.
|
||||
#
|
||||
|
||||
@@ -153,8 +153,8 @@ def findCptDir(options, cptdir, testsys):
|
||||
# Assumes that the checkpoint dir names are formatted as follows:
|
||||
dirs = listdir(cptdir)
|
||||
expr = re.compile(
|
||||
"cpt\.simpoint_(\d+)_inst_(\d+)"
|
||||
+ "_weight_([\d\.e\-]+)_interval_(\d+)_warmup_(\d+)"
|
||||
r"cpt\.simpoint_(\d+)_inst_(\d+)"
|
||||
+ r"_weight_([\d\.e\-]+)_interval_(\d+)_warmup_(\d+)"
|
||||
)
|
||||
cpts = []
|
||||
for dir in dirs:
|
||||
@@ -190,7 +190,7 @@ def findCptDir(options, cptdir, testsys):
|
||||
|
||||
else:
|
||||
dirs = listdir(cptdir)
|
||||
expr = re.compile("cpt\.([0-9]+)")
|
||||
expr = re.compile(r"cpt\.([0-9]+)")
|
||||
cpts = []
|
||||
for dir in dirs:
|
||||
match = expr.match(dir)
|
||||
@@ -325,7 +325,7 @@ def parseSimpointAnalysisFile(options, testsys):
|
||||
line = simpoint_file.readline()
|
||||
if not line:
|
||||
break
|
||||
m = re.match("(\d+)\s+(\d+)", line)
|
||||
m = re.match(r"(\d+)\s+(\d+)", line)
|
||||
if m:
|
||||
interval = int(m.group(1))
|
||||
else:
|
||||
@@ -334,7 +334,7 @@ def parseSimpointAnalysisFile(options, testsys):
|
||||
line = weight_file.readline()
|
||||
if not line:
|
||||
fatal("not enough lines in simpoint weight file!")
|
||||
m = re.match("([0-9\.e\-]+)\s+(\d+)", line)
|
||||
m = re.match(r"([0-9\.e\-]+)\s+(\d+)", line)
|
||||
if m:
|
||||
weight = float(m.group(1))
|
||||
else:
|
||||
|
||||
@@ -30,7 +30,7 @@ config_path = os.path.dirname(os.path.abspath(__file__))
|
||||
config_root = os.path.dirname(config_path)
|
||||
|
||||
|
||||
class PathSearchFunc(object):
|
||||
class PathSearchFunc:
|
||||
_sys_paths = None
|
||||
environment_variable = "M5_PATH"
|
||||
|
||||
@@ -58,7 +58,7 @@ class PathSearchFunc(object):
|
||||
paths = list(filter(os.path.isdir, paths))
|
||||
|
||||
if not paths:
|
||||
raise IOError(
|
||||
raise OSError(
|
||||
"Can't find system files directory, "
|
||||
"check your {} environment variable".format(
|
||||
self.environment_variable
|
||||
@@ -72,7 +72,7 @@ class PathSearchFunc(object):
|
||||
try:
|
||||
return next(p for p in paths if os.path.exists(p))
|
||||
except StopIteration:
|
||||
raise IOError(
|
||||
raise OSError(
|
||||
f"Can't find file '{filepath}' on {self.environment_variable}."
|
||||
)
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ def copyfiles(srcdir, dstdir):
|
||||
os.symlink(".", outlink)
|
||||
|
||||
|
||||
class Benchmark(object):
|
||||
class Benchmark:
|
||||
def __init__(self, isa, os, input_set):
|
||||
if not hasattr(self.__class__, "name"):
|
||||
self.name = self.__class__.__name__
|
||||
@@ -877,7 +877,7 @@ class vortex(Benchmark):
|
||||
else:
|
||||
raise AttributeError(f"unknown ISA {isa}")
|
||||
|
||||
super(vortex, self).__init__(isa, os, input_set)
|
||||
super().__init__(isa, os, input_set)
|
||||
|
||||
def test(self, isa, os):
|
||||
self.args = [f"{self.endian}.raw"]
|
||||
|
||||
Reference in New Issue
Block a user