fix: remove pathlike metadata as it wasn't useful

nipy · Jul 17, 2019 · 6c3858a · 6c3858a
1 parent c1d1151
commit 6c3858a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/nipype/interfaces/base/traits_extension.py b/nipype/interfaces/base/traits_extension.py
@@ -100,7 +100,6 @@ class BasePath(TraitType):
 
     # A description of the type of value this trait accepts:
     exists = False
-    pathlike = False
     resolve = False
     _is_file = False
     _is_dir = False
@@ -121,12 +120,10 @@ def info_text(self):
                 info_text += ' file or directory'
         return info_text
 
-    def __init__(self, value=Undefined,
-                 exists=False, pathlike=False, resolve=False, **metadata):
+    def __init__(self, value=Undefined, exists=False, resolve=False, **metadata):
         """Create a BasePath trait."""
         self.exists = exists
         self.resolve = resolve
-        self.pathlike = pathlike
         super(BasePath, self).__init__(value, **metadata)
 
     def validate(self, objekt, name, value, return_pathlike=False):
@@ -151,7 +148,7 @@ def validate(self, objekt, name, value, return_pathlike=False):
         if self.resolve:
             value = value.resolve(strict=self.exists)
 
-        if not return_pathlike and not self.pathlike:
+        if not return_pathlike:
             value = str(value)
 
         return value
@@ -277,8 +274,8 @@ class File(BasePath):
     _is_file = True
     _exts = None
 
-    def __init__(self, value=NoDefaultSpecified, exists=False, pathlike=False,
-                 resolve=False, allow_compressed=True, extensions=None, **metadata):
+    def __init__(self, value=NoDefaultSpecified, exists=False, resolve=False,
+                 allow_compressed=True, extensions=None, **metadata):
         """Create a File trait."""
         if extensions is not None:
             if isinstance(extensions, (bytes, str)):
@@ -290,8 +287,8 @@ def __init__(self, value=NoDefaultSpecified, exists=False, pathlike=False,
             self._exts = sorted(set(['.%s' % ext if not ext.startswith('.') else ext
                                      for ext in extensions]))
 
-        super(File, self).__init__(value=value, exists=exists,
-                                   pathlike=pathlike, resolve=resolve, **metadata)
+        super(File, self).__init__(value=value, exists=exists, resolve=resolve,
+                                   extensions=self._exts, **metadata)
 
     def validate(self, objekt, name, value, return_pathlike=False):
         """Validate a value change."""
@@ -301,7 +298,7 @@ def validate(self, objekt, name, value, return_pathlike=False):
             if ext not in self._exts:
                 self.error(objekt, name, str(value))
 
-        if not return_pathlike and not self.pathlike:
+        if not return_pathlike:
             value = str(value)
 
         return value
@@ -311,7 +308,7 @@ class ImageFile(File):
     """Defines a trait whose value must be a known neuroimaging file."""
 
     def __init__(self, value=NoDefaultSpecified, exists=False,
-                 pathlike=False, resolve=False, types=None, **metadata):
+                 resolve=False, types=None, **metadata):
         """Create an ImageFile trait."""
         extensions = None
         if types is not None:
@@ -327,7 +324,7 @@ def __init__(self, value=NoDefaultSpecified, exists=False,
 
         super(ImageFile, self).__init__(
             value=value, exists=exists, extensions=extensions,
-            pathlike=pathlike, resolve=resolve, **metadata)
+            resolve=resolve, **metadata)
 
 
 def isdefined(objekt):

diff --git a/nipype/interfaces/spm/base.py b/nipype/interfaces/spm/base.py
@@ -600,9 +600,8 @@ def _make_matlab_command(self, contents, postscript=None):
 class ImageFileSPM(ImageFile):
     """Defines a trait whose value must be a NIfTI file."""
 
-    def __init__(self, value=NoDefaultSpecified, exists=False,
-                 pathlike=False, resolve=False, **metadata):
+    def __init__(self, value=NoDefaultSpecified, exists=False, resolve=False, **metadata):
         """Create an ImageFileSPM trait."""
         super(ImageFileSPM, self).__init__(
-            value=value, exists=exists, types=['nifti1', 'nifti2'], allow_compressed=False,
-            pathlike=pathlike, resolve=resolve, **metadata)
+            value=value, exists=exists, types=['nifti1', 'nifti2'],
+            allow_compressed=False, resolve=resolve, **metadata)