Skip to content

Commit e915829

Browse files
committed
Merge pull request #1298 from oesteban/fix/CheckInputsLoggingHashDiff
[FIX] Add list check and conversion to dict
2 parents 1353628 + 5888dc9 commit e915829

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

CHANGES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
Next release
22
============
33

4+
* FIX: Minor bugfix logging hash differences (https://github.com/nipy/nipype/pull/1298)
45
* FIX: Use released Prov python library (https://github.com/nipy/nipype/pull/1279)
56
* ENH: Support for Python 3 (https://github.com/nipy/nipype/pull/1221)
67
* FIX: VTK version check missing when using tvtk (https://github.com/nipy/nipype/pull/1219)

nipype/utils/logger.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,13 @@ def logdebug_dict_differences(self, dold, dnew, prefix=""):
8787
8888
typical use -- log difference for hashed_inputs
8989
"""
90+
# First check inputs, since they usually are lists of tuples
91+
# and dicts are required.
92+
if isinstance(dnew, list):
93+
dnew = dict(dnew)
94+
if isinstance(dold, list):
95+
dold = dict(dold)
96+
9097
# Compare against hashed_inputs
9198
# Keys: should rarely differ
9299
new_keys = set(dnew.keys())

0 commit comments

Comments
 (0)