Address PR comments

Author: Vasileios Karakasis

unittests/test_cli.py

@@ -3,14 +3,14 @@
 #
 # SPDX-License-Identifier: BSD-3-Clause
 
+import contextlib
+import io
 import itertools
 import os
 import pathlib
 import pytest
 import re
 import sys
-from contextlib import redirect_stdout, redirect_stderr, suppress
-from io import StringIO
 
 import reframe.core.config as config
 import reframe.core.environments as env
@@ -26,11 +26,11 @@ def run_command_inline(argv, funct, *args, **kwargs):
     sys.argv = argv
     exitcode = None
 
-    captured_stdout = StringIO()
-    captured_stderr = StringIO()
+    captured_stdout = io.StringIO()
+    captured_stderr = io.StringIO()
     print(*sys.argv)
-    with redirect_stdout(captured_stdout):
-        with redirect_stderr(captured_stderr):
+    with contextlib.redirect_stdout(captured_stdout):
+        with contextlib.redirect_stderr(captured_stderr):
             try:
                 with rt.temp_runtime(None):
                     exitcode = funct(*args, **kwargs)
@@ -632,10 +632,8 @@ def test_overwrite_module_path(run_reframe, user_exec_ctx):
         pytest.skip('no modules system found')
 
     module_path = 'unittests/modules'
-    try:
+    with contextlib.suppress(KeyError):
         module_path += f':{os.environ["MODULEPATH"]}'
-    except KeyError:
-        pass
 
     returncode, stdout, stderr = run_reframe(
         more_options=[f'--module-path={module_path}', '--module=testmod_foo'],