Skip to content

Commit da1f544

Browse files
authored
Merge pull request #1593 from mgclark/pep8/spm
[ENH] Improved PEP8 Compliance for interfaces/spm
2 parents fd4dbde + 8424b80 commit da1f544

File tree

4 files changed

+538
-306
lines changed

4 files changed

+538
-306
lines changed

nipype/interfaces/spm/base.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@
1414
spm.SPMCommand().version
1515
"""
1616

17+
# Standard library imports
1718
from __future__ import print_function
1819
from builtins import range
1920
from builtins import object
20-
21-
__docformat__ = 'restructuredtext'
22-
23-
# Standard library imports
2421
import os
2522
from copy import deepcopy
2623

@@ -38,6 +35,8 @@
3835
from ... import logging
3936
logger = logging.getLogger('interface')
4037

38+
__docformat__ = 'restructuredtext'
39+
4140

4241
def func_is_3d(in_file):
4342
"""Checks if input functional files are 3d."""
@@ -216,7 +215,8 @@ class SPMCommandInputSpec(BaseInterfaceInputSpec):
216215
usedefault=True)
217216
use_mcr = traits.Bool(desc='Run m-code using SPM MCR')
218217
use_v8struct = traits.Bool(True, min_ver='8', usedefault=True,
219-
desc=('Generate SPM8 and higher compatible jobs')
218+
desc=('Generate SPM8 and higher '
219+
'compatible jobs')
220220
)
221221

222222

@@ -476,14 +476,15 @@ def _make_matlab_command(self, contents, postscript=None):
476476
end\n
477477
"""
478478
if self.mlab.inputs.mfile:
479-
if isdefined(self.inputs.use_v8struct) and self.inputs.use_v8struct:
479+
if (isdefined(self.inputs.use_v8struct) and
480+
self.inputs.use_v8struct):
480481
mscript += self._generate_job('jobs{1}.spm.%s.%s' %
481482
(self.jobtype, self.jobname),
482483
contents[0])
483484
else:
484485
if self.jobname in ['st', 'smooth', 'preproc', 'preproc8',
485-
'fmri_spec', 'fmri_est', 'factorial_design',
486-
'defs']:
486+
'fmri_spec', 'fmri_est',
487+
'factorial_design', 'defs']:
487488
# parentheses
488489
mscript += self._generate_job('jobs{1}.%s{1}.%s(1)' %
489490
(self.jobtype, self.jobname),

0 commit comments

Comments
 (0)