File(Directory) class didnt dffer from BaseFile(Directory), i.e. didnt use a afast validator, so i renamed BaseFile(Directory) to File(Directory) and removed extra classes

Author: djarecka

nipype/interfaces/base/traits_extension.py

@@ -54,7 +54,7 @@ class Str(Unicode):
 traits.DictStrStr = DictStrStr
 
 
-class BaseFile(BaseUnicode):
+class File(BaseUnicode):
     """ Defines a trait whose value must be the name of a file.
     """
 
@@ -96,14 +96,11 @@ def __init__(self,
         if exists:
             self.info_text = 'an existing file name'
 
-        super(BaseFile, self).__init__(value, **metadata)
+        super(File, self).__init__(value, **metadata)
 
     def validate(self, object, name, value):
-        """ Validates that a specified value is valid for this trait.
-
-            Note: The 'fast validator' version performs this check in C.
-        """
-        validated_value = super(BaseFile, self).validate(object, name, value)
+        """ Validates that a specified value is valid for this trait."""
+        validated_value = super(File, self).validate(object, name, value)
         if not self.exists:
             return validated_value
         elif os.path.isfile(value):
@@ -117,53 +114,12 @@ def validate(self, object, name, value):
         self.error(object, name, value)
 
 
-class File(BaseFile):
-    """
-    Defines a trait whose value must be the name of a file.
-    Disables the default C-level fast validator.
-    """
-
-    def __init__(self,
-                 value='',
-                 filter=None,
-                 auto_set=False,
-                 entries=0,
-                 exists=False,
-                 **metadata):
-        """ Creates a File trait.
-
-        Parameters
-        ----------
-        value : string
-            The default value for the trait
-        filter : string
-            A wildcard string to filter filenames in the file dialog box used by
-            the attribute trait editor.
-        auto_set : boolean
-            Indicates whether the file editor updates the trait value after
-            every key stroke.
-        exists : boolean
-            Indicates whether the trait value must be an existing file or
-            not.
-
-        Default Value
-        -------------
-        *value* or ''
-        """
-        # if not exists:
-        #     # Define the C-level fast validator to use:
-        #     fast_validate = (11, str)
-
-        super(File, self).__init__(value, filter, auto_set, entries, exists,
-                                   **metadata)
-
-
 # -------------------------------------------------------------------------------
-#  'BaseDirectory' and 'Directory' traits:
+#  'Directory' trait
 # -------------------------------------------------------------------------------
 
 
-class BaseDirectory(BaseUnicode):
+class Directory(BaseUnicode):
     """
     Defines a trait whose value must be the name of a directory.
     """
@@ -177,7 +133,7 @@ def __init__(self,
                  entries=0,
                  exists=False,
                  **metadata):
-        """ Creates a BaseDirectory trait.
+        """ Creates a Directory trait.
 
         Parameters
         ----------
@@ -201,13 +157,10 @@ def __init__(self,
         if exists:
             self.info_text = 'an existing directory name'
 
-        super(BaseDirectory, self).__init__(value, **metadata)
+        super(Directory, self).__init__(value, **metadata)
 
     def validate(self, object, name, value):
-        """ Validates that a specified value is valid for this trait.
-
-            Note: The 'fast validator' version performs this check in C.
-        """
+        """ Validates that a specified value is valid for this trait."""
         if isinstance(value, (str, bytes)):
             if not self.exists:
                 return value
@@ -222,44 +175,6 @@ def validate(self, object, name, value):
         self.error(object, name, value)
 
 
-class Directory(BaseDirectory):
-    """
-    Defines a trait whose value must be the name of a directory.
-    Disables the default C-level fast validator.
-    """
-
-    def __init__(self,
-                 value='',
-                 auto_set=False,
-                 entries=0,
-                 exists=False,
-                 **metadata):
-        """ Creates a Directory trait.
-
-        Parameters
-        ----------
-        value : string
-            The default value for the trait
-        auto_set : boolean
-            Indicates whether the directory editor updates the trait value
-            after every key stroke.
-        exists : boolean
-            Indicates whether the trait value must be an existing directory or
-            not.
-
-        Default Value
-        -------------
-        *value* or ''
-        """
-        # Define the C-level fast validator to use if the directory existence
-        # test is not required:
-        # if not exists:
-        #     self.fast_validate = (11, str)
-
-        super(Directory, self).__init__(value, auto_set, entries, exists,
-                                        **metadata)
-
-
 # lists of tuples
 # each element consists of :
 # - uncompressed (tuple[0]) extension