Fix and reenable useless-object-inheritance.
Initial change generated using:
git ls-tree -r HEAD | awk '$1 != "120000" {print $NF}' | \
grep '\.py$' | grep -v -e ^third_party/ -e '_pb2\.py' | \
xargs sed -i 's/(object)//g'
Required only a handful of manual edits after that, mostly for
unrelated lint fixes.
BUG=None
TEST=run_tests, CQ
Change-Id: I0c57fdcf20124530ecd33ae3118506a2be9fc0ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/4637436
Auto-Submit: Alex Klein <saklein@chromium.org>
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Tested-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
diff --git a/scripts/sysmon/git_metrics.py b/scripts/sysmon/git_metrics.py
index 2a5b07d..f8155e1 100644
--- a/scripts/sysmon/git_metrics.py
+++ b/scripts/sysmon/git_metrics.py
@@ -16,7 +16,7 @@
logger = logging.getLogger(__name__)
-class _GitRepo(object):
+class _GitRepo:
"""Helper class for running git commands."""
def __init__(self, gitdir):
@@ -56,7 +56,7 @@
return added_total, deleted_total
-class _GitMetricCollector(object):
+class _GitMetricCollector:
"""Class for collecting metrics about a git repository.
The constructor takes the arguments: `gitdir`, `metric_path`.
diff --git a/scripts/sysmon/loop.py b/scripts/sysmon/loop.py
index 534870b..87f7eba 100644
--- a/scripts/sysmon/loop.py
+++ b/scripts/sysmon/loop.py
@@ -13,7 +13,7 @@
logger = logging.getLogger(__name__)
-class SleepLoop(object):
+class SleepLoop:
"""Sleep loop."""
def __init__(self, callback, interval=60):
diff --git a/scripts/sysmon/loop_unittest.py b/scripts/sysmon/loop_unittest.py
index 988e9ea..37a63c1 100644
--- a/scripts/sysmon/loop_unittest.py
+++ b/scripts/sysmon/loop_unittest.py
@@ -15,7 +15,7 @@
from chromite.scripts.sysmon import loop
-class _MockTime(object):
+class _MockTime:
"""Mock time and sleep.
Provides mock behavior for time.time() and time.sleep()
diff --git a/scripts/sysmon/mainlib.py b/scripts/sysmon/mainlib.py
index e23a9ac..fd9e040 100644
--- a/scripts/sysmon/mainlib.py
+++ b/scripts/sysmon/mainlib.py
@@ -26,7 +26,7 @@
logger = logging.getLogger(__name__)
-class _MetricCollector(object):
+class _MetricCollector:
"""Metric collector class."""
def __init__(self):
@@ -50,7 +50,7 @@
metrics.Flush()
-class _TimedCallback(object):
+class _TimedCallback:
"""Limits callback to one call in a given interval."""
def __init__(self, callback, interval):
diff --git a/scripts/sysmon/proc_metrics.py b/scripts/sysmon/proc_metrics.py
index 33be4e3..8222362 100644
--- a/scripts/sysmon/proc_metrics.py
+++ b/scripts/sysmon/proc_metrics.py
@@ -58,7 +58,7 @@
collector.collect()
-class _ProcessMetricsCollector(object):
+class _ProcessMetricsCollector:
"""Class for collecting process metrics."""
# We need to store some per process metrics of last run in order to
@@ -193,7 +193,7 @@
self._other_metric.flush()
-class _ProcessMetric(object):
+class _ProcessMetric:
"""Class for gathering process metrics."""
def __init__(self, process_name, test_func=lambda proc: True):
@@ -276,7 +276,7 @@
self._io_counters = _IOCounters()
-class _CPUTimes(object):
+class _CPUTimes:
"""A container for CPU times metrics."""
def __init__(self, v=None):
@@ -430,7 +430,7 @@
return proc.name() == cmd and len(cmdline) > 1 and cmdline[1] == subcmd
-class _CPUTimes(object):
+class _CPUTimes:
"""A container for CPU times metrics."""
def __init__(self, v=None):
@@ -473,7 +473,7 @@
}
-class _IOCounters(object):
+class _IOCounters:
"""A container for I/O counter metrics."""
def __init__(self, v=None):
diff --git a/scripts/sysmon/puppet_metrics.py b/scripts/sysmon/puppet_metrics.py
index d2fd322..d123feb 100644
--- a/scripts/sysmon/puppet_metrics.py
+++ b/scripts/sysmon/puppet_metrics.py
@@ -50,7 +50,7 @@
)
-class _PuppetRunSummary(object):
+class _PuppetRunSummary:
"""Puppet run summary information."""
def __init__(self, f):