Merge pull request nipreps#541 from mgxd/rf/py36

RF: update to py36+

Author: oesteban

niworkflows/reports/core.py

@@ -137,7 +137,6 @@ 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()))
         )

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,17 +251,17 @@ 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
+    from pathlib import Path
+    import shutil
+
+    try:
+        for f in Path(path).iterdir():
+            if f.is_file() or f.is_symlink():
+                f.unlink()
+            elif f.is_dir():
+                shutil.rmtree(str(f))
+    except OSError:
+        return False
     return True