Skip to content

[FIX] Add list check and conversion to dict #1298

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Dec 17, 2015
Merged

[FIX] Add list check and conversion to dict #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bce98b
Add list check and conversion to dict
oesteban Dec 15, 2015
6172119
update CHANGES
oesteban Dec 15, 2015
5888dc9
Merge branch 'master' into fix/CheckInputsLoggingHashDiff
oesteban Dec 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Next release
============

* FIX: Minor bugfix logging hash differences (https://github.com/nipy/nipype/pull/1298)
* FIX: Use released Prov python library (https://github.com/nipy/nipype/pull/1279)
* ENH: Support for Python 3 (https://github.com/nipy/nipype/pull/1221)
* FIX: VTK version check missing when using tvtk (https://github.com/nipy/nipype/pull/1219)
Expand Down
7 changes: 7 additions & 0 deletions nipype/utils/logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,13 @@ def logdebug_dict_differences(self, dold, dnew, prefix=""):

typical use -- log difference for hashed_inputs
"""
# First check inputs, since they usually are lists of tuples
# and dicts are required.
if isinstance(dnew, list):
dnew = dict(dnew)
if isinstance(dold, list):
dold = dict(dold)

# Compare against hashed_inputs
# Keys: should rarely differ
new_keys = set(dnew.keys())
Expand Down