reverted traits change

Author: satra

nipype/interfaces/base.py

@@ -499,17 +499,6 @@ def _get_sorteddict(self, object, dictwithhash=False, hash_method=None, hash_fil
                     out = object
         return out
 
-    def __getstate__(self):
-        state = super(BaseTraitedSpec, self).__getstate__()
-        inst_traits = self._instance_traits()
-        state['__instance_traits__'] = inst_traits
-        return state
-
-    def __setstate__(self, state):
-        inst_traits = state.pop('__instance_traits__', {})
-        for attr, trait in inst_traits.iteritems():
-            self.add_trait(attr, trait)
-        super(BaseTraitedSpec, self).__setstate__(state)
 
 class DynamicTraitedSpec(BaseTraitedSpec):
     """ A subclass to handle dynamic traits
@@ -524,9 +513,20 @@ def __deepcopy__(self, memo):
         id_self = id(self)
         if id_self in memo:
             return memo[id_self]
-        dup_dict = deepcopy(self.__getstate__(), memo)
+        dup_dict = deepcopy(self.get(), memo)
+        # access all keys
+        for key in self.copyable_trait_names():
+            _ = getattr(self, key)
+        # clone once
         dup = self.clone_traits(memo=memo)
-        dup.__setstate__(dup_dict)
+        for key in self.copyable_trait_names():
+            try:
+                _ = getattr(dup, key)
+            except:
+                pass
+        # clone twice
+        dup = self.clone_traits(memo=memo)
+        dup.set(**dup_dict)
         return dup