diff --git a/ckan/controllers/api.py b/ckan/controllers/api.py
index a2b5d0834c7..d20f016ed05 100644
--- a/ckan/controllers/api.py
+++ b/ckan/controllers/api.py
@@ -288,7 +288,7 @@ def convert_to_dict(user):
             return out
 
         query = query.limit(limit)
-        out = list(map(convert_to_dict, query.all()))
+        out = [convert_to_dict(q) for q in query.all()]
         return out
 
     @jsonp.jsonpify
diff --git a/ckan/lib/dictization/model_save.py b/ckan/lib/dictization/model_save.py
index 58030a48f11..8da4b059c1a 100644
--- a/ckan/lib/dictization/model_save.py
+++ b/ckan/lib/dictization/model_save.py
@@ -420,7 +420,7 @@ def group_dict_save(group_dict, context, prevent_packages_update=False):
     package_ids.extend( pkgs_edited['added'] )
     if package_ids:
         session.commit()
-        list(map(rebuild, package_ids))
+        [rebuild(package_id) for package_id in package_ids]
 
     return group
 
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
index a27b640a514..29764b9d0bb 100644
--- a/ckan/lib/helpers.py
+++ b/ckan/lib/helpers.py
@@ -1512,7 +1512,7 @@ def date_str_to_datetime(date_str):
         microseconds = int(m.groupdict(0).get('microseconds'))
         time_tuple = time_tuple[:5] + [seconds, microseconds]
 
-    return datetime.datetime(*list(map(int, time_tuple)))
+    return datetime.datetime(*list(int(item) for item in time_tuple))
 
 
 @core_helper
diff --git a/ckan/model/license.py b/ckan/model/license.py
index efecc02578b..1cf6d5d2406 100644
--- a/ckan/model/license.py
+++ b/ckan/model/license.py
@@ -35,7 +35,7 @@ def __init__(self, data):
             if key == 'date_created':
                 # Parse ISO formatted datetime.
                 value = datetime.datetime(
-                    *list(map(int, re.split('[^\d]', value))))
+                    *list(int(item) for item in re.split('[^\d]', value)))
                 self._data[key] = value
             elif isinstance(value, str):
                 # Convert str to unicode (keeps Pylons and SQLAlchemy happy).