[MAINT] Cleanup engine/base

Author: oesteban

nipype/pipeline/engine/base.py

@@ -18,17 +18,15 @@
                         absolute_import)
 from builtins import object
 
-from future import standard_library
-standard_library.install_aliases()
-
 from copy import deepcopy
 import re
 import numpy as np
-from ... import logging
+from future import standard_library
+
 from ...interfaces.base import DynamicTraitedSpec
 from ...utils.filemanip import loadpkl, savepkl
 
-logger = logging.getLogger('workflow')
+standard_library.install_aliases()
 
 
 class EngineBase(object):
@@ -47,35 +45,37 @@ def __init__(self, name=None, base_dir=None):
             default=None, which results in the use of mkdtemp
 
         """
+        self._hierarchy = None
+        self._name = None
+
         self.base_dir = base_dir
         self.config = None
-        self._verify_name(name)
         self.name = name
-        # for compatibility with node expansion using iterables
-        self._id = self.name
-        self._hierarchy = None
 
     @property
-    def inputs(self):
-        raise NotImplementedError
+    def name(self):
+        return self._name
 
-    @property
-    def outputs(self):
-        raise NotImplementedError
+    @name.setter
+    def name(self, name):
+        if name and bool(re.match(r'^[\w_]+$', name)):
+            self._name = name
+        else:
+            raise ValueError('[Workflow|Node] name "%s" is not valid.' % name)
 
     @property
     def fullname(self):
-        fullname = self.name
         if self._hierarchy:
-            fullname = self._hierarchy + '.' + self.name
-        return fullname
+            return '%s.%s' % (self._hierarchy, self.name)
+        return self.name
 
     @property
-    def itername(self):
-        itername = self._id
-        if self._hierarchy:
-            itername = self._hierarchy + '.' + self._id
-        return itername
+    def inputs(self):
+        raise NotImplementedError
+
+    @property
+    def outputs(self):
+        raise NotImplementedError
 
     def clone(self, name):
         """Clone an EngineBase object
@@ -86,13 +86,10 @@ def clone(self, name):
         name : string (mandatory)
             A clone of node or workflow must have a new name
         """
-        if (name is None) or (name == self.name):
-            raise Exception('Cloning requires a new name')
-        self._verify_name(name)
+        if name == self.name:
+            raise ValueError('Cloning requires a new name, "%s" is in use.' % name)
         clone = deepcopy(self)
         clone.name = name
-        clone._id = name
-        clone._hierarchy = None
         return clone
 
     def _check_outputs(self, parameter):
@@ -103,17 +100,8 @@ def _check_inputs(self, parameter):
             return True
         return hasattr(self.inputs, parameter)
 
-    def _verify_name(self, name):
-        valid_name = bool(re.match('^[\w-]+$', name))
-        if not valid_name:
-            raise ValueError('[Workflow|Node] name \'%s\' contains'
-                             ' special characters' % name)
-
-    def __repr__(self):
-        if self._hierarchy:
-            return '.'.join((self._hierarchy, self._id))
-        else:
-            return '{}'.format(self._id)
+    def __str__(self):
+        return self.fullname
 
     def save(self, filename=None):
         if filename is None:

nipype/pipeline/engine/nodes.py

@@ -161,12 +161,14 @@ def __init__(self,
 
         super(Node, self).__init__(name, kwargs.get('base_dir'))
 
-        self.name = name
         self._interface = interface
         self._hierarchy = None
         self._got_inputs = False
         self._originputs = None
         self._output_dir = None
+        self._id = None  # for compatibility with node expansion using iterables
+
+        self.name = name
         self.iterables = iterables
         self.synchronize = synchronize
         self.itersource = itersource
@@ -228,7 +230,6 @@ def n_procs(self):
         if hasattr(self._interface.inputs, 'num_threads') and isdefined(
                 self._interface.inputs.num_threads):
             return self._interface.inputs.num_threads
-
         return 1
 
     @n_procs.setter
@@ -240,6 +241,13 @@ def n_procs(self, value):
         if hasattr(self._interface.inputs, 'num_threads'):
             self._interface.inputs.num_threads = self._n_procs
 
+    @property
+    def itername(self):
+        itername = self._id
+        if self._hierarchy:
+            itername = self._hierarchy + '.' + self._id
+        return itername
+
     def output_dir(self):
         """Return the location of the output directory for the node"""
         # Output dir is cached