gdb/testsuite: avoid bare except in Python files

Fix flake8 warnings like this:

    gdb/testsuite/gdb.python/py-unwind-inline.py:62:9: E722 do not use bare 'except'

Change-Id: I9736c948bc84fefcb7db2a6ac7322cbbfe39da94
Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/testsuite/gdb.cp/pretty-print.py b/gdb/testsuite/gdb.cp/pretty-print.py
index 6ee8d71cbe1f637b976570a06bfac6e23cb8c2de..81ac03b713f097c45eea286449d67278ab16f92b 100644 (file)
--- a/gdb/testsuite/gdb.cp/pretty-print.py
+++ b/gdb/testsuite/gdb.cp/pretty-print.py
@@ -49,7 +49,7 @@ class FilteringTypePrinter(object):
 
                 try:
                     self._type_obj = gdb.lookup_type(self.name).strip_typedefs()
-                except:
+                except Exception:
                     pass
 
             if self._type_obj is None:

diff --git a/gdb/testsuite/gdb.perf/lib/perftest/measure.py b/gdb/testsuite/gdb.perf/lib/perftest/measure.py
index 0e06cad84a520de0f64a402a757862be57f6f0a0..efd620a1c45a947f98d3e4a3731688409f292b45 100644 (file)
--- a/gdb/testsuite/gdb.perf/lib/perftest/measure.py
+++ b/gdb/testsuite/gdb.perf/lib/perftest/measure.py
@@ -158,7 +158,7 @@ class MeasurementVmSize(Measurement):
             t = open(file_path)
             v = t.read()
             t.close()
-        except:
+        except Exception:
             return 0
         i = v.index(key)
         v = v[i:].split(None, 3)

diff --git a/gdb/testsuite/gdb.python/py-disasm.py b/gdb/testsuite/gdb.python/py-disasm.py
index 4c44de55a723eb5428d94e28dd36b3cd0520f925..95fe9ff4117919ebba5fceb643095b5c1d7f6b30 100644 (file)
--- a/gdb/testsuite/gdb.python/py-disasm.py
+++ b/gdb/testsuite/gdb.python/py-disasm.py
@@ -357,7 +357,7 @@ class GlobalCachingDisassembler(TestDisassembler):
                 raise gdb.GdbError("DisassembleInfo.address is still valid")
             except RuntimeError as e:
                 assert str(e) == "DisassembleInfo is no longer valid."
-            except:
+            except Exception:
                 raise gdb.GdbError(
                     "DisassembleInfo.address raised an unexpected exception"
                 )
@@ -367,7 +367,7 @@ class GlobalCachingDisassembler(TestDisassembler):
                 raise gdb.GdbError("DisassembleInfo.architecture is still valid")
             except RuntimeError as e:
                 assert str(e) == "DisassembleInfo is no longer valid."
-            except:
+            except Exception:
                 raise gdb.GdbError(
                     "DisassembleInfo.architecture raised an unexpected exception"
                 )
@@ -377,7 +377,7 @@ class GlobalCachingDisassembler(TestDisassembler):
                 raise gdb.GdbError("DisassembleInfo.read is still valid")
             except RuntimeError as e:
                 assert str(e) == "DisassembleInfo is no longer valid."
-            except:
+            except Exception:
                 raise gdb.GdbError(
                     "DisassembleInfo.read raised an unexpected exception"
                 )

diff --git a/gdb/testsuite/gdb.python/py-send-packet.py b/gdb/testsuite/gdb.python/py-send-packet.py
index 0a0b3591711e6c9db9e32c1a9774900e86f1808c..842a305b07b7232b8afa112a83255bdcd20dbf86 100644 (file)
--- a/gdb/testsuite/gdb.python/py-send-packet.py
+++ b/gdb/testsuite/gdb.python/py-send-packet.py
@@ -144,7 +144,7 @@ def run_set_global_var_test():
         res = conn.send_packet("X%x,4:\xff\xff\xff\xff" % addr)
     except UnicodeError:
         saw_error = True
-    except:
+    except Exception:
         assert False
 
     assert saw_error

diff --git a/gdb/testsuite/gdb.python/py-unwind-inline.py b/gdb/testsuite/gdb.python/py-unwind-inline.py
index ca6b16e8980ebc9504b1838021e88a7700eb7f5e..1bdfd93527c09bb5b0df517fab6ff4aeb16edd2e 100644 (file)
--- a/gdb/testsuite/gdb.python/py-unwind-inline.py
+++ b/gdb/testsuite/gdb.python/py-unwind-inline.py
@@ -59,7 +59,7 @@ class dummy_unwinder(Unwinder):
         try:
             for r in self.get_regs(pending_frame):
                 v = pending_frame.read_register(r).cast(self.void_ptr_t)
-        except:
+        except Exception:
             print("Dummy unwinder, exception")
             raise