use pathlib operations where possible

Author: fsoubelet

generic_parser/entrypoint_parser.py

@@ -369,9 +369,8 @@ def _handle_kwargs(self, kwargs):
                     f"Only '{ID_JSON:s}' and '{ID_SECTION:s}'"
                     " arguments are allowed, when using a json file."
                 )
-            with open(kwargs[ID_JSON]) as json_file:
-                json_dict = json.load(json_file)
 
+            json_dict = json.loads(Path(kwargs[ID_JSON]).read_text())
             if ID_SECTION in kwargs:
                 json_dict = json_dict[kwargs[ID_SECTION]]
 
@@ -415,7 +414,7 @@ def _read_config(self, cfgfile_path, section=None):
         # create new config parser, as it keeps defaults between files
         cfgparse = self._create_config_parser()
 
-        with open(cfgfile_path) as config_file:
+        with Path(cfgfile_path).open() as config_file:
             cfgparse.read_file(config_file)
 
         sections = cfgparse.sections()
@@ -797,5 +796,4 @@ def _to_key_value_str(key, value):
         else:
             lines += f"; {' '.join(unknown)}\n"
 
-    with open(filepath, "w") as f:
-        f.write(lines)
+    Path(filepath).write_text(lines)

generic_parser/tools.py

@@ -10,6 +10,7 @@
 import sys
 from contextlib import contextmanager
 from io import StringIO
+from pathlib import Path
 
 LOG = logging.getLogger(__name__)
 
@@ -111,7 +112,7 @@ def silence():
     """
     Suppress all console output. ``sys.stdout`` and ``sys.stderr`` are rerouted to ``devnull``.
     """
-    with open(os.devnull, "w") as devnull, log_out(stdout=devnull, stderr=devnull):
+    with Path(os.devnull).open("w") as devnull, log_out(stdout=devnull, stderr=devnull):
         yield
 
 

tests/test_entrypoint.py

@@ -181,18 +181,17 @@ def test_as_argv():  # almost identical to above
 
 def test_as_config(tmp_path):
     cfg_file = tmp_path / "config.ini"
-    with open(cfg_file, "w") as f:
-        f.write(
-            "\n".join(
-                [
-                    "[Section]",
-                    "name = 'myname'",
-                    "int = 3",
-                    "list = [4, 5, 6]",
-                    "unknown = 'other'",
-                ]
-            )
+    Path(cfg_file).write_text(
+        "\n".join(
+            [
+                "[Section]",
+                "name = 'myname'",
+                "int = 3",
+                "list = [4, 5, 6]",
+                "unknown = 'other'",
+            ]
         )
+    )
 
     # test config as kwarg
     opt1, unknown1 = paramtest_function(entry_cfg=cfg_file, section="Section")
@@ -309,8 +308,7 @@ def test_save_cli_options_cfg(tmp_path):
     save_options_to_config(cfg_file, opt, unknown)
     opt_load, unknown_load = paramtest_function(entry_cfg=cfg_file)
 
-    with open(cfg_file) as f:
-        content = f.read()
+    content = Path(cfg_file).read_text()
     assert "Unknown" in content
     assert "--other" in content
 
@@ -352,16 +350,13 @@ def fun(opt):
         return opt
 
     cfg_quotes = tmp_path / "config_quotes.ini"
-    with open(cfg_quotes, "w") as f:
-        f.write("[Section]\nname = 'My String with Spaces'")
+    Path(cfg_quotes).write_text("[Section]\nname = 'My String with Spaces'")
 
     cfg_doublequotes = tmp_path / "config_doublequotes.ini"
-    with open(cfg_doublequotes, "w") as f:
-        f.write('[Section]\nname = "My String with Spaces"')
+    Path(cfg_doublequotes).write_text('[Section]\nname = "My String with Spaces"')
 
     cfg_noquotes = tmp_path / "config_noquotes.ini"
-    with open(cfg_noquotes, "w") as f:
-        f.write("[Section]\nname = My String with Spaces")
+    Path(cfg_noquotes).write_text("[Section]\nname = My String with Spaces")
 
     opt_quotes = fun(entry_cfg=cfg_quotes)
     opt_doublequotes = fun(entry_cfg=cfg_doublequotes)
@@ -520,8 +515,7 @@ def fun(opt):
     assert opt.bos == "myString"
 
     cfg_file = tmp_path / "bos.ini"
-    with open(cfg_file, "w") as f:
-        f.write("[Section]\nbos = 'myString'")
+    Path(cfg_file).write_text("[Section]\nbos = 'myString'")
     opt = fun(entry_cfg=cfg_file)
     assert opt.bos == "myString"
 
@@ -538,8 +532,7 @@ def fun(opt):
         return opt
 
     cfg_file = tmp_path / "bos.ini"
-    with open(cfg_file, "w") as f:
-        f.write("[Section]\nbos1 = 'myString'\nbos2 = True")
+    Path(cfg_file).write_text("[Section]\nbos1 = 'myString'\nbos2 = True")
     opt = fun(entry_cfg=cfg_file)
     assert opt.bos1 == "myString"
     assert opt.bos2 is True
@@ -578,8 +571,7 @@ def fun(opt):
         return opt
 
     cfg_file = tmp_path / "bol.ini"
-    with open(cfg_file, "w") as f:
-        f.write("[Section]\nbol1 = 1,2\nbol2 = True")
+    Path(cfg_file).write_text("[Section]\nbol1 = 1,2\nbol2 = True")
     opt = fun(entry_cfg=cfg_file)
     assert opt.bol1 == [1, 2]
     assert opt.bol2 is True