RF: apply changes from @oesteban review

Author: mgxd

niworkflows/reports/core.py

@@ -138,7 +138,7 @@ def __init__(self, layout, out_dir, config=None):
             raise RuntimeError("Reportlet must have a config object")
 
         self.name = config.get(
-            "name", "_".join("%s-%s" % i for i in config["bids"].items())
+            "name", "_".join("%s-%s" % i for i in sorted(config["bids"].items()))
         )
         self.title = config.get("title")
         self.subtitle = config.get("subtitle")

niworkflows/utils/misc.py

@@ -1,8 +1,6 @@
 # emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: nil -*-
 # vi: set ft=python sts=4 ts=4 sw=4 et:
 """Miscellaneous utilities."""
-import os
-import shutil
 
 
 __all__ = [
@@ -253,18 +251,17 @@ def clean_directory(path):
     This function is not guaranteed to work across multiple threads or processes.
 
     """
-    with os.scandir(path) as sd:
-        for f in sd:
+    from pathlib import Path
+    import shutil
+
+    try:
+        for f in Path(path).iterdir():
             if f.is_file() or f.is_symlink():
-                try:
-                    os.unlink(f.path)
-                except OSError:
-                    return False
+                f.unlink()
             elif f.is_dir():
-                try:
-                    shutil.rmtree(f.path)
-                except OSError:
-                    return False
+                shutil.rmtree(str(f))
+    except OSError:
+        return False
     return True