Suppress consider-using-with on return statements

ChangeLog

@@ -20,6 +20,10 @@ Release date: TBA
 
   Closes #4498
 
+* ``consider-using-with`` is no longer triggered if a context manager is returned from a function.
+
+  Closes #4748
+
 * pylint does not crash with a traceback anymore when a file is problematic. It
   creates a template text file for opening an issue on the bug tracker instead.
   The linting can go on for other non problematic files instead of being impossible.

doc/whatsnew/2.10.rst

@@ -48,6 +48,8 @@ Other Changes
 
 * Pyreverse - add output in PlantUML format
 
+* ``consider-using-with`` is no longer triggered if a context manager is returned from a function.
+
 * pylint does not crash with a traceback anymore when a file is problematic. It
   creates a template text file for opening an issue on the bug tracker instead.
   The linting can go on for other non problematic files instead of being impossible.

pylint/checkers/refactoring/refactoring_checker.py

@@ -113,6 +113,16 @@ def _is_inside_context_manager(node: astroid.Call) -> bool:
     )
 
 
+def _is_a_return_statement(node: astroid.Call) -> bool:
+    frame = node.frame()
+    parent = node.parent
+    while parent is not frame:
+        if isinstance(parent, astroid.Return):
+            return True
+        parent = parent.parent
+    return False
+
+
 def _is_part_of_with_items(node: astroid.Call) -> bool:
     """
     Checks if one of the node's parents is an ``astroid.With`` node and that the node itself is located
@@ -1443,8 +1453,10 @@ def _append_context_managers_to_stack(self, node: astroid.Assign) -> None:
             stack[varname] = value
 
     def _check_consider_using_with(self, node: astroid.Call):
-        if _is_inside_context_manager(node):
-            # if we are inside a context manager itself, we assume that it will handle the resource management itself.
+        if _is_inside_context_manager(node) or _is_a_return_statement(node):
+            # If we are inside a context manager itself, we assume that it will handle the resource management itself.
+            # If the node is a child of a return, we assume that the caller knows he is getting a context manager
+            # he should use properly (i.e. in a ``with``).
             return
         if (
             node

tests/functional/c/consider/consider_using_with_open.py

@@ -64,3 +64,7 @@ def test_single_line_with(file1):
 def test_multiline_with_items(file1, file2, which):
     with (open(file1, encoding="utf-8") if which
         else open(file2, encoding="utf-8")) as input_file: return input_file.read()
+
+
+def test_suppress_on_return():
+    return open("foo", encoding="utf8")  # must not trigger