Skip to content

Commit db479b1

Browse files
committed
fix spm.Info when spm is not installed
1 parent 16eafc0 commit db479b1

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

nipype/interfaces/spm/base.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,19 +136,22 @@ class Info(PackageInfo):
136136
def path(klass, matlab_cmd=None, paths=None, use_mcr=None):
137137
if klass._path:
138138
return klass._path
139-
return klass.getinfo(matlab_cmd, paths, use_mcr)['path']
139+
klass.getinfo(matlab_cmd, paths, use_mcr)
140+
return klass._path
140141

141142
@classmethod
142143
def version(klass, matlab_cmd=None, paths=None, use_mcr=None):
143144
if klass._version:
144145
return klass._version
145-
return klass.getinfo(matlab_cmd, paths, use_mcr)['release']
146+
klass.getinfo(matlab_cmd, paths, use_mcr)
147+
return klass._version
146148

147149
@classmethod
148150
def name(klass, matlab_cmd=None, paths=None, use_mcr=None):
149151
if klass._name:
150152
return klass._name
151-
return klass.getinfo(matlab_cmd, paths, use_mcr)['name']
153+
klass.getinfo(matlab_cmd, paths, use_mcr)
154+
return klass._name
152155

153156
@classmethod
154157
def getinfo(klass, matlab_cmd=None, paths=None, use_mcr=None):
@@ -185,9 +188,9 @@ def getinfo(klass, matlab_cmd=None, paths=None, use_mcr=None):
185188
}
186189

187190
use_mcr = use_mcr or 'FORCE_SPMMCR' in os.environ
188-
matlab_cmd = ((use_mcr and os.getenv('SPMMCRCMD')) or
189-
os.getenv('MATLABCMD') or
190-
'matlab -nodesktop -nosplash')
191+
matlab_cmd = (
192+
(use_mcr and os.getenv('SPMMCRCMD')) or
193+
os.getenv('MATLABCMD', 'matlab -nodesktop -nosplash'))
191194

192195
mlab = MatlabCommand(matlab_cmd=matlab_cmd,
193196
resource_monitor=False)

0 commit comments

Comments
 (0)