fixup! Convert codebase to pathlib

rtslib/node.py

@@ -102,19 +102,19 @@ def _list_files(self, path, writable=None, readable=None):
             return []
 
         if writable is None and readable is None:
-            names = sorted(path.iterdir())
+            names = [p.name for p in path.glob('*') if p.is_file()]
         else:
             names = []
-            for name in path.iterdir():
-                if name.is_file():
-                    sres = Path.stat(name)
+            for p in path.iterdir():
+                if p.is_file():
+                    sres = Path.stat(p)
                     if (writable is not None and
                             writable != ((sres[stat.ST_MODE] & stat.S_IWUSR) == stat.S_IWUSR)):
                         continue
                     if (readable is not None and
                             readable != ((sres[stat.ST_MODE] & stat.S_IRUSR) == stat.S_IRUSR)):
                         continue
-                    names.append(name)
+                    names.append(p.name)
 
         return sorted(names)
 

rtslib/root.py

@@ -455,25 +455,21 @@ def save_to_file(self, save_file=None, so_path=None):
         umask = 0o777 ^ mode  # Prevents always downgrading umask to 0
 
         # For security, remove file with potentially elevated mode
-        with suppress(OSError):
-            tmp_file.unlink()
+        tmp_file.unlink(missing_ok=True)
 
         original_umask = os.umask(umask)
         # Even though the old file is first deleted, a race condition is still
         # possible. mode='x' opens the file for exclusive creation,
         # failing if the file already exists
         try:
-            with tmp_file.open(mode="x"):
-                pass
+            with tmp_file.open(mode="x") as f:
+                json.dump(saveconf, f, sort_keys=True, indent=2)
+                f.write("\n")
+                f.flush()
+                os.fsync(f.fileno())
         except OSError as e:
             raise RuntimeError(f"Could not open {tmp_file}") from e
 
-        with tmp_file.open(mode="w") as f:
-            json.dump(saveconf, f, sort_keys=True, indent=2)
-            f.write("\n")
-            f.flush()
-            os.fsync(f.fileno())
-
         # move along with permissions
         tmp_file.replace(save_file)
         save_file.chmod(mode)