RF: update to py36+

Author: mgxd

niworkflows/reports/core.py

@@ -137,9 +137,8 @@ def __init__(self, layout, out_dir, config=None):
         if not config:
             raise RuntimeError("Reportlet must have a config object")
 
-        # PY35: Sorted config dict for consistent behavior
         self.name = config.get(
-            "name", "_".join("%s-%s" % i for i in sorted(config["bids"].items()))
+            "name", "_".join("%s-%s" % i for i in config["bids"].items())
         )
         self.title = config.get("title")
         self.subtitle = config.get("subtitle")

niworkflows/utils/misc.py

@@ -253,17 +253,18 @@ def clean_directory(path):
     This function is not guaranteed to work across multiple threads or processes.
 
     """
-    for f in os.scandir(path):  # switch to context manager when py35 dropped
-        if f.is_file() or f.is_symlink():
-            try:
-                os.unlink(f.path)
-            except OSError:
-                return False
-        elif f.is_dir():
-            try:
-                shutil.rmtree(f.path)
-            except OSError:
-                return False
+    with os.scandir(path) as sd:
+        for f in sd:
+            if f.is_file() or f.is_symlink():
+                try:
+                    os.unlink(f.path)
+                except OSError:
+                    return False
+            elif f.is_dir():
+                try:
+                    shutil.rmtree(f.path)
+                except OSError:
+                    return False
     return True