Make sure to filter out None and Uninferable when gathering exceptions

Close #2434
pylint-dev · Aug 23, 2018 · 064f378 · 064f378
1 parent 10d688e
commit 064f378
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/pylint/checkers/exceptions.py b/pylint/checkers/exceptions.py
@@ -362,7 +362,7 @@ def gather_exceptions_from_handler(handler):
                     exceptions = {exception
                                   for exception in exceptions_in_handler.elts
                                   if isinstance(exception, astroid.Name)}
-                else:
+                elif exceptions_in_handler:
                     exceptions = [exceptions_in_handler]
             return exceptions
 

diff --git a/pylint/test/functional/try_except_raise.py b/pylint/test/functional/try_except_raise.py
@@ -1,5 +1,5 @@
 # pylint:disable=missing-docstring, unreachable, bad-except-order, bare-except, unnecessary-pass
-
+# pylint: disable=undefined-variable
 try:
     int("9a")
 except:  # [try-except-raise]
@@ -95,3 +95,11 @@ def ddd():
     raise
 except (OverflowError, ZeroDivisionError):
     print("a failure")
+
+
+try:
+    pass
+except invalid_name:  # [try-except-raise]
+    raise
+except TypeError:
+    pass
diff --git a/pylint/test/functional/try_except_raise.txt b/pylint/test/functional/try_except_raise.txt
@@ -4,3 +4,4 @@ try-except-raise:53:ddd:The except handler raises immediately
 try-except-raise:67::The except handler raises immediately
 try-except-raise:72::The except handler raises immediately
 try-except-raise:94::The except handler raises immediately
+try-except-raise:102::The except handler raises immediately