SONARPY-950 S5708 (CaughtExceptionCheck) should not report on Ambiguous Symbols that might inherit from BaseException (#1031)

andrea-guarino-sonarsource · guillaume-dequenne · commit ff4d92b39bca · 2022-01-10T13:26:34.000+01:00
diff --git a/its/ruling/src/test/resources/expected/python-S5708.json b/its/ruling/src/test/resources/expected/python-S5708.json
diff --git a/python-checks/src/main/java/org/sonar/python/checks/CaughtExceptionsCheck.java b/python-checks/src/main/java/org/sonar/python/checks/CaughtExceptionsCheck.java
@@ -83,6 +83,6 @@ private static boolean inheritsFromBaseException(@Nullable Symbol symbol) {
       return true;
     }
     ClassSymbol classSymbol = (ClassSymbol) symbol;
-    return classSymbol.isOrExtends(BASE_EXCEPTION) || classSymbol.hasUnresolvedTypeHierarchy();
+    return classSymbol.canBeOrExtend(BASE_EXCEPTION);
   }
 }
diff --git a/python-checks/src/test/resources/checks/caughtExceptions.py b/python-checks/src/test/resources/checks/caughtExceptions.py
@@ -55,3 +55,9 @@ def foo():
     foo = 1/0
   except exceptions:
     foo = 0
+
+  import smtplib
+  try:
+    ...
+  except smtplib.SMTPServerDisconnected:  # OK, SMTPServerDisconnected when Python version is unknown
+    ...

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,6 @@ private static boolean inheritsFromBaseException(@Nullable Symbol symbol) {`
`83`	`83`	`return true;`
`84`	`84`	`}`
`85`	`85`	`ClassSymbol classSymbol = (ClassSymbol) symbol;`
`86`		`- return classSymbol.isOrExtends(BASE_EXCEPTION) \|\| classSymbol.hasUnresolvedTypeHierarchy();`
	`86`	`+ return classSymbol.canBeOrExtend(BASE_EXCEPTION);`
`87`	`87`	`}`
`88`	`88`	`}`