Skip to content

Commit 05b5bbb

Browse files
committed
Merge branch 'maint/1.3.x'
2 parents 5e9d9b5 + 082369f commit 05b5bbb

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

.et

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{ "bad_versions" : [ "1.2.1",
2-
"1.2.3"]
3-
}
2+
"1.2.3",
3+
"1.3.0"]
4+
}

doc/changelog/1.X.X-changelog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
1.3.1 (November 12, 2019)
2+
=========================
3+
4+
* FIX: Restore checking traits or bunch (https://github.com/nipy/nipype/pull/3094)
5+
6+
17
1.3.0 (November 11, 2019)
28
=========================
39

nipype/pipeline/engine/nodes.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,12 @@ def _get_inputs(self):
551551
output_value = evaluate_connect_function(
552552
conn[1], conn[2], value)
553553
else:
554-
output_value = getattr(outputs, conn)
554+
output_name = conn
555+
try:
556+
output_value = outputs.trait_get()[output_name]
557+
except AttributeError:
558+
output_value = outputs.dictcopy()[output_name]
559+
logger.debug("output: %s", output_name)
555560

556561
try:
557562
self.set_input(key, deepcopy(output_value))

0 commit comments

Comments
 (0)