fixed several errors

Author: oesteban

nipype/interfaces/dipy/preprocess.py

@@ -23,9 +23,6 @@
     package_check('dipy', version='0.6.0')
 except Exception as e:
     have_dipy = False
-else:
-    from dipy.align.aniso2iso import resample
-    from dipy.core.gradients import GradientTable
 
 
 class ResampleInputSpec(TraitedSpec):
@@ -172,6 +169,7 @@ def resample_proxy(in_file, order=3, new_zooms=None, out_file=None):
     """
     Performs regridding of an image to set isotropic voxel sizes using dipy.
     """
+    from dipy.align.aniso2iso import resample
 
     if out_file is None:
         fname, fext = op.splitext(op.basename(in_file))

nipype/pipeline/engine/nodes.py

@@ -28,7 +28,11 @@
     from ordereddict import OrderedDict
 
 from copy import deepcopy
-import pickle
+try:
+    import cPickle as pickle
+except:
+    import pickle
+
 from glob import glob
 import gzip
 import inspect
@@ -81,12 +85,12 @@ def _write_inputs(node):
             if type(val) == str:
                 try:
                     func = create_function_from_source(val)
-                except RuntimeError, e:
+                except RuntimeError:
                     lines.append("%s.inputs.%s = '%s'" % (nodename, key, val))
                 else:
                     funcname = [name for name in func.func_globals
                                 if name != '__builtins__'][0]
-                    lines.append(cPickle.loads(val))
+                    lines.append(pickle.loads(val))
                     if funcname == nodename:
                         lines[-1] = lines[-1].replace(' %s(' % funcname,
                                                       ' %s_1(' % funcname)
@@ -207,7 +211,7 @@ def _check_inputs(self, parameter):
         return hasattr(self.inputs, parameter)
 
     def _verify_name(self, name):
-        valid_name = bool(re.match('^[\w-]+$', name))
+        valid_name = bool(re.match(r'^[\w-]+$', name))
         if not valid_name:
             raise Exception('the name must not contain any special characters')
 
@@ -650,7 +654,7 @@ def export(self, filename=None, prefix="output", format="python",
                             lines.append(connect_template2 % line_args)
             functionlines = ['# Functions']
             for function in functions:
-                functionlines.append(cPickle.loads(function).rstrip())
+                functionlines.append(pickle.loads(function).rstrip())
             all_lines = importlines + functionlines + lines
 
             if not filename: