From 7530d52174988076c182a9e6cd43eca7a574925f Mon Sep 17 00:00:00 2001
From: Tim Newsome <tim@sifive.com>
Date: Tue, 31 May 2022 13:25:18 -0700
Subject: Address pylint warnings. (#385)

I'm running a newer version of pylint, and thus there are new warnings
to be fixed. All very minor.
---
 debug/gdbserver.py                         | 4 ++--
 debug/targets.py                           | 1 +
 debug/targets/RISC-V/spike-multi.py        | 6 +++---
 debug/targets/RISC-V/spike32-2-hwthread.py | 4 ++--
 debug/targets/RISC-V/spike32-2.py          | 4 ++--
 debug/targets/RISC-V/spike64-2-hwthread.py | 4 ++--
 debug/targets/RISC-V/spike64-2-rtos.py     | 4 ++--
 debug/targets/RISC-V/spike64-2.py          | 4 ++--
 8 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debug/gdbserver.py b/debug/gdbserver.py
index c75267d..7213183 100755
--- a/debug/gdbserver.py
+++ b/debug/gdbserver.py
@@ -1610,8 +1610,8 @@ class TranslateTest(GdbSingleHartTest):
             satp = mode << 60
         try:
             self.gdb.p("$satp=0x%x" % satp)
-        except testlib.CouldNotFetch:
-            raise TestNotApplicable
+        except testlib.CouldNotFetch as cnf:
+            raise TestNotApplicable from cnf
         readback = self.gdb.p("$satp")
         self.gdb.p("$satp=0")
         if readback != satp:
diff --git a/debug/targets.py b/debug/targets.py
index dd0175e..727a882 100644
--- a/debug/targets.py
+++ b/debug/targets.py
@@ -226,6 +226,7 @@ class Target:
                     self.compiler_supports_v = False
                 else:
                     raise
+        return None
 
 def add_target_options(parser):
     parser.add_argument("target", help=".py file that contains definition for "
diff --git a/debug/targets/RISC-V/spike-multi.py b/debug/targets/RISC-V/spike-multi.py
index 82de76f..571506d 100644
--- a/debug/targets/RISC-V/spike-multi.py
+++ b/debug/targets/RISC-V/spike-multi.py
@@ -1,9 +1,9 @@
-import targets
-import testlib
-
 import spike32  # pylint: disable=import-error
 import spike64  # pylint: disable=import-error
 
+import targets
+import testlib
+
 class multispike(targets.Target):
     harts = [
         spike32.spike32_hart(misa=0x4034112d, system=0),
diff --git a/debug/targets/RISC-V/spike32-2-hwthread.py b/debug/targets/RISC-V/spike32-2-hwthread.py
index d54136d..3a24269 100644
--- a/debug/targets/RISC-V/spike32-2-hwthread.py
+++ b/debug/targets/RISC-V/spike32-2-hwthread.py
@@ -1,8 +1,8 @@
+import spike32  # pylint: disable=import-error
+
 import targets
 import testlib
 
-import spike32  # pylint: disable=import-error
-
 class spike32_2(targets.Target):
     harts = [spike32.spike32_hart(misa=0x40341129),
             spike32.spike32_hart(misa=0x40341129)]
diff --git a/debug/targets/RISC-V/spike32-2.py b/debug/targets/RISC-V/spike32-2.py
index ca198d7..ca62610 100644
--- a/debug/targets/RISC-V/spike32-2.py
+++ b/debug/targets/RISC-V/spike32-2.py
@@ -1,8 +1,8 @@
+import spike32  # pylint: disable=import-error
+
 import targets
 import testlib
 
-import spike32  # pylint: disable=import-error
-
 class spike32_2(targets.Target):
     harts = [spike32.spike32_hart(misa=0x40141125),
             spike32.spike32_hart(misa=0x40141125)]
diff --git a/debug/targets/RISC-V/spike64-2-hwthread.py b/debug/targets/RISC-V/spike64-2-hwthread.py
index db381d4..1ac184a 100644
--- a/debug/targets/RISC-V/spike64-2-hwthread.py
+++ b/debug/targets/RISC-V/spike64-2-hwthread.py
@@ -1,8 +1,8 @@
+import spike64  # pylint: disable=import-error
+
 import targets
 import testlib
 
-import spike64  # pylint: disable=import-error
-
 class spike64_2(targets.Target):
     harts = [spike64.spike64_hart(misa=0x8000000000341129),
             spike64.spike64_hart(misa=0x8000000000341129)]
diff --git a/debug/targets/RISC-V/spike64-2-rtos.py b/debug/targets/RISC-V/spike64-2-rtos.py
index acb217f..33c1ff2 100644
--- a/debug/targets/RISC-V/spike64-2-rtos.py
+++ b/debug/targets/RISC-V/spike64-2-rtos.py
@@ -1,8 +1,8 @@
+import spike64  # pylint: disable=import-error
+
 import targets
 import testlib
 
-import spike64  # pylint: disable=import-error
-
 class spike64_2_rtos(targets.Target):
     harts = [spike64.spike64_hart(misa=0x8000000000141129),
             spike64.spike64_hart(misa=0x8000000000141129)]
diff --git a/debug/targets/RISC-V/spike64-2.py b/debug/targets/RISC-V/spike64-2.py
index e710fe1..48326ad 100644
--- a/debug/targets/RISC-V/spike64-2.py
+++ b/debug/targets/RISC-V/spike64-2.py
@@ -1,8 +1,8 @@
+import spike64  # pylint: disable=import-error
+
 import targets
 import testlib
 
-import spike64  # pylint: disable=import-error
-
 class spike64_2(targets.Target):
     harts = [spike64.spike64_hart(misa=0x8000000000141129),
             spike64.spike64_hart(misa=0x8000000000141129)]
-- 
cgit v1.1