Merge pull request #688 from satra/fix/python26compat

fix: change dict comprehension to list comprehension for 2.6 compatibility

Author: satra

nipype/pipeline/engine.py

@@ -13,7 +13,10 @@
 """
 
 from datetime import datetime
-from collections import OrderedDict
+try:
+    from collections import OrderedDict
+except ImportError:
+    from ordereddict import OrderedDict
 from copy import deepcopy
 import cPickle
 from glob import glob
@@ -1844,8 +1847,8 @@ def _add_join_item_fields(self):
         """
         # create the new join item fields
         idx = self._next_slot_index
-        newfields = {field: self._add_join_item_field(field, idx)
-            for field in self.joinfield}
+        newfields = dict([(field, self._add_join_item_field(field, idx))
+                          for field in self.joinfield])
         # increment the join slot index
         logger.debug("Added the %s join item fields %s." % (self, newfields))
         self._next_slot_index += 1

nipype/pipeline/utils.py

@@ -634,8 +634,8 @@ def generate_expanded_graph(graph_in):
             # The itersource iterables is a {field: lookup} dictionary, where the
             # lookup is a {source key: iteration list} dictionary. Look up the
             # current iterable value using the predecessor itersource input values.
-            iter_dict = {field: lookup[key] for field, lookup in inode.iterables
-                         if key in lookup}
+            iter_dict = dict([(field, lookup[key]) for field, lookup in
+                              inode.iterables if key in lookup])
             # convert the iterables to the standard {field: function} format
             iter_items = map(lambda(field, value): (field, lambda: value),
                              iter_dict.iteritems())
@@ -846,7 +846,7 @@ def _transpose_iterables(fields, values):
     Otherwise, the result is a list of (field: value list) pairs.
     """
     if isinstance(values, dict):
-        transposed = {field: defaultdict(list) for field in fields}
+        transposed = dict([(field, defaultdict(list)) for field in fields])
         for key, tuples in values.iteritems():
             for kvals in tuples:
                 for idx, val in enumerate(kvals):