Merge pull request #3125 from k-nut/3123-dict-comprehension

Dict comprehension without pep8 problems
ckan · Jun 20, 2016 · d423687 · d423687
2 parents 817d97d + 5503851
commit d423687
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/ckan/lib/config_tool.py b/ckan/lib/config_tool.py
@@ -189,9 +189,9 @@ def insert_new_sections(new_sections):
             # at start of new section, write the 'add'ed options
             for option in changes.get(section, 'add'):
                 write_option(option)
-            options_to_edit_in_this_section = dict(
-                [(option.key, option)
-                 for option in changes.get(section, 'edit')])
+            options_to_edit_in_this_section = {option.key: option
+                                               for option
+                                               in changes.get(section, 'edit')}
             continue
         existing_option = parse_option_string(section, line)
         if not existing_option:

diff --git a/ckan/lib/create_test_data.py b/ckan/lib/create_test_data.py
@@ -187,7 +187,7 @@ def create_arbitrary(cls, package_dicts, relationships=[],
                                     if not isinstance(v, datetime.datetime):
                                         v = unicode(v)
                                     non_extras[str(k)] = v
-                            extras = dict([(str(k), unicode(v)) for k, v in res_dict.get('extras', {}).items()])
+                            extras = {str(k): unicode(v) for k, v in res_dict.get('extras', {}).items()}
                             pkg.add_resource(extras=extras, **non_extras)
                     elif attr == 'tags':
                         if isinstance(val, (str, unicode)):

diff --git a/ckan/lib/dictization/model_save.py b/ckan/lib/dictization/model_save.py
@@ -157,10 +157,8 @@ def package_tag_list_save(tag_dicts, package, context):
                             for package_tag in
                             package.package_tag_all)
 
-    tag_package_tag_inactive = dict(
-        [ (tag,pt) for tag,pt in tag_package_tag.items() if
-            pt.state in ['deleted'] ]
-        )
+    tag_package_tag_inactive = {tag: pt for tag,pt in tag_package_tag.items() if
+            pt.state in ['deleted']}
 
     tag_name_vocab = set()
     tags = set()

diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py
@@ -618,7 +618,7 @@ def create_schema_for_required_keys(keys):
     ''' helper function that creates a schema definition where
     each key from keys is validated against ``not_missing``.
     '''
-    schema = dict([(x, [not_missing]) for x in keys])
+    schema = {x: [not_missing] for x in keys}
     return schema
 
 

diff --git a/ckan/model/package.py b/ckan/model/package.py
@@ -204,7 +204,7 @@ def as_dict(self, ref_package_by='name', ref_group_by='name'):
         groups = [getattr(group, ref_group_by) for group in self.get_groups()]
         groups.sort()
         _dict['groups'] = groups
-        _dict['extras'] = dict([(key, value) for key, value in self.extras.items()])
+        _dict['extras'] = {key: value for key, value in self.extras.items()}
         _dict['ratings_average'] = self.get_average_rating()
         _dict['ratings_count'] = len(self.ratings)
         _dict['resources'] = [res.as_dict(core_columns_only=False) \