From da0c365f3d5d8f4bad6d381bc99e9fac6b7b2559 Mon Sep 17 00:00:00 2001
From: Luiz Georg <luizgngeorg@gmail.com>
Date: Mon, 11 Jul 2022 09:30:25 -0300
Subject: [PATCH] Tools/LogAnalyzer: Use more specific exceptions

---
 Tools/LogAnalyzer/DataflashLog.py       | 12 ++++++------
 Tools/LogAnalyzer/LogAnalyzer.py        |  2 +-
 Tools/LogAnalyzer/tests/TestAutotune.py |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Tools/LogAnalyzer/DataflashLog.py b/Tools/LogAnalyzer/DataflashLog.py
index b4131a272b..f7f9555f53 100644
--- a/Tools/LogAnalyzer/DataflashLog.py
+++ b/Tools/LogAnalyzer/DataflashLog.py
@@ -40,7 +40,7 @@ class Format(object):
                 return int(value)
             elif valueType in "nNZ":
                 return str(value)
-        except:
+        except ValueError:
             pass
         return value
 
@@ -261,7 +261,7 @@ class Channel(object):
             if line >= lineNumber:
                 return (self.listData[index][1], line)
             index += 1
-        raise Exception("Error finding nearest value for line %d" % lineNumber)
+        raise ValueError("Error finding nearest value for line %d" % lineNumber)
 
     def getNearestValueBack(self, lineNumber):
         '''Returns (value,lineNumber)'''
@@ -272,19 +272,19 @@ class Channel(object):
             if line <= lineNumber:
                 return (self.listData[index][1], line)
             index -= 1
-        raise Exception("Error finding nearest value for line %d" % lineNumber)
+        raise ValueError("Error finding nearest value for line %d" % lineNumber)
 
     def getNearestValue(self, lineNumber, lookForwards=True):
         '''find the nearest data value to the given lineNumber, defaults to first looking forwards. Returns (value,lineNumber)'''
         if lookForwards:
             try:
                 return self.getNearestValueFwd(lineNumber)
-            except:
+            except ValueError:
                 return self.getNearestValueBack(lineNumber)
         else:
             try:
                 return self.getNearestValueBack(lineNumber)
-            except:
+            except ValueError:
                 return self.getNearestValueFwd(lineNumber)
         raise Exception("Error finding nearest value for line %d" % lineNumber)
 
@@ -797,7 +797,7 @@ class DataflashLog(object):
                     break
                 try:
                     e = typ.from_buffer(data, offset)
-                except:
+                except ValueError:
                     print(
                         "data:{} offset:{} size:{} sizeof:{} sum:{}".format(
                             len(data), offset, typ.SIZE, ctypes.sizeof(typ), offset + typ.SIZE
diff --git a/Tools/LogAnalyzer/LogAnalyzer.py b/Tools/LogAnalyzer/LogAnalyzer.py
index b91fc0bcdd..cfa163982e 100755
--- a/Tools/LogAnalyzer/LogAnalyzer.py
+++ b/Tools/LogAnalyzer/LogAnalyzer.py
@@ -154,7 +154,7 @@ class TestSuite(object):
                 xml = sys.stdout
             else:
                 xml = open(xmlFile, 'w')
-        except:
+        except IOError:
             sys.stderr.write("Error opening output xml file: %s" % xmlFile)
             sys.exit(1)
 
diff --git a/Tools/LogAnalyzer/tests/TestAutotune.py b/Tools/LogAnalyzer/tests/TestAutotune.py
index 6bf297aa1a..7128da79df 100644
--- a/Tools/LogAnalyzer/tests/TestAutotune.py
+++ b/Tools/LogAnalyzer/tests/TestAutotune.py
@@ -120,7 +120,7 @@ class TestAutotune(Test):
                         line = logdata.channels['ATUN']['RateMax'].getNearestValueFwd(linenext)[1]
                         if line > a.linestop:
                             break
-                    except:
+                    except ValueError:
                         break
                     atun = class_from_channel('ATUN')()
                     for key in logdata.channels['ATUN']: