Skip to content

Commit 07487c9

Browse files
satraBen Cipollini
authored and
Ben Cipollini
committed
fix: test_base errors
1 parent d63d334 commit 07487c9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

nipype/interfaces/base.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -943,9 +943,9 @@ def _check_version_requirements(self, trait_object, raise_exception=True):
943943
names = trait_object.trait_names(**check)
944944

945945
if names:
946+
if not self.version:
947+
return None
946948
version = LooseVersion(str(self.version))
947-
if not version:
948-
return
949949
for name in names:
950950
min_ver = LooseVersion(str(trait_object.traits()[name].min_ver))
951951
if min_ver > version:
@@ -1025,7 +1025,7 @@ def run(self, **inputs):
10251025
self._check_version_requirements(self.inputs)
10261026
interface = self.__class__
10271027
# initialize provenance tracking
1028-
env = dict(os.environ)
1028+
env = deepcopy(dict(os.environ))
10291029
runtime = Bunch(cwd=os.getcwd(),
10301030
returncode=None,
10311031
duration=None,
@@ -1264,8 +1264,8 @@ def _process(drain=0):
12641264
result['merged'] = [r[1] for r in temp]
12651265
if output == 'allatonce':
12661266
stdout, stderr = proc.communicate()
1267-
result['stdout'] = stdout.split('\n')
1268-
result['stderr'] = stderr.split('\n')
1267+
result['stdout'] = stdout.decode().split('\n')
1268+
result['stderr'] = stderr.decode().split('\n')
12691269
result['merged'] = ''
12701270
if output == 'file':
12711271
ret_code = proc.wait()

0 commit comments

Comments
 (0)