Merge remote-tracking branch 'upstream/master' into fix/Py3UseBuiltinOpen

Author: oesteban

nipype/interfaces/nipy/model.py

@@ -18,7 +18,7 @@
     have_nipy = False
 else:
     import nipy.modalities.fmri.design_matrix as dm
-    import nipy.labs.glm.glm as GLM
+    import nipy.modalities.fmri.glm as GLM
 
 if have_nipy:
     try:
@@ -159,7 +159,7 @@ def _run_interface(self, runtime):
             pylab.close()
             pylab.clf()
 
-        glm = GLM.glm()
+        glm = GLM.GeneralLinearModel()
         glm.fit(timeseries.T, design_matrix, method=self.inputs.method, model=self.inputs.model)
 
         self._beta_file = os.path.abspath("beta.nii")
@@ -267,7 +267,7 @@ def _run_interface(self, runtime):
         else:
             mask = np.ones(beta_nii.shape[:3]) == 1
 
-        glm = GLM.glm()
+        glm = GLM.GeneralLinearModel()
         nii = nb.load(self.inputs.beta)
         glm.beta = beta_nii.get_data().copy()[mask, :].T
         glm.nvbeta = self.inputs.nvbeta