Clarify no-else-raise and no-else-return also apply to try/except (#10002)

Author: levon-d

doc/user_guide/checkers/features.rst

@@ -891,13 +891,15 @@ Refactoring checker Messages
   containing a continue statement. As such, it will warn when it encounters an
   else following a chain of ifs, all of them containing a continue statement.
 :no-else-raise (R1720): *Unnecessary "%s" after "raise", %s*
-  Used in order to highlight an unnecessary block of code following an if
-  containing a raise statement. As such, it will warn when it encounters an
-  else following a chain of ifs, all of them containing a raise statement.
+  Used in order to highlight an unnecessary block of code following an if, or a
+  try/except containing a raise statement. As such, it will warn when it
+  encounters an else following a chain of ifs, all of them containing a raise
+  statement.
 :no-else-return (R1705): *Unnecessary "%s" after "return", %s*
-  Used in order to highlight an unnecessary block of code following an if
-  containing a return statement. As such, it will warn when it encounters an
-  else following a chain of ifs, all of them containing a return statement.
+  Used in order to highlight an unnecessary block of code following an if, or a
+  try/except containing a return statement. As such, it will warn when it
+  encounters an else following a chain of ifs, all of them containing a return
+  statement.
 :unnecessary-dict-index-lookup (R1733): *Unnecessary dictionary index lookup, use '%s' instead*
   Emitted when iterating over the dictionary items (key-item pairs) and
   accessing the value by index lookup. The value can be accessed directly

pylint/checkers/refactoring/refactoring_checker.py

@@ -285,7 +285,7 @@ class RefactoringChecker(checkers.BaseTokenChecker):
             'Unnecessary "%s" after "return", %s',
             "no-else-return",
             "Used in order to highlight an unnecessary block of "
-            "code following an if containing a return statement. "
+            "code following an if, or a try/except containing a return statement. "
             "As such, it will warn when it encounters an else "
             "following a chain of ifs, all of them containing a "
             "return statement.",
@@ -387,7 +387,7 @@ class RefactoringChecker(checkers.BaseTokenChecker):
             'Unnecessary "%s" after "raise", %s',
             "no-else-raise",
             "Used in order to highlight an unnecessary block of "
-            "code following an if containing a raise statement. "
+            "code following an if, or a try/except containing a raise statement. "
             "As such, it will warn when it encounters an else "
             "following a chain of ifs, all of them containing a "
             "raise statement.",