clean the validation errors in logic action

ckan/logic/action/create.py

@@ -21,7 +21,6 @@
 # Define some shortcuts
 # Ensure they are module-private so that they don't get loaded as available
 # actions in the action API.
-_error_summary = ckan.logic.action.error_summary
 _validate = ckan.lib.navl.dictization_functions.validate
 _check_access = logic.check_access
 _get_action = logic.get_action
@@ -130,7 +129,7 @@ def package_create(context, data_dict):
 
     if errors:
         model.Session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     rev = model.repo.new_revision()
     rev.author = user
@@ -173,7 +172,7 @@ def package_create_validate(context, data_dict):
 
     if errors:
         model.Session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
     else:
         return data
 
@@ -237,7 +236,7 @@ def resource_create(context, data_dict):
         pkg_dict = _get_action('package_update')(context, pkg_dict)
     except ValidationError, e:
         errors = e.error_dict['resources'][-1]
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     return pkg_dict['resources'][-1]
 
@@ -278,7 +277,7 @@ def related_create(context, data_dict):
                             context)
     if errors:
         model.Session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     related = model_save.related_dict_save(data, context)
     if not context.get('defer_commit'):
@@ -336,7 +335,7 @@ def package_relationship_create(context, data_dict):
 
     if errors:
         model.Session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     _check_access('package_relationship_create', context, data_dict)
 
@@ -491,7 +490,7 @@ def group_create(context, data_dict):
 
     if errors:
         session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     rev = model.repo.new_revision()
     rev.author = user
@@ -630,7 +629,7 @@ def user_create(context, data_dict):
 
     if errors:
         session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     user = model_save.user_dict_save(data, context)
 
@@ -719,7 +718,7 @@ def vocabulary_create(context, data_dict):
 
     if errors:
         model.Session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     vocabulary = model_save.vocabulary_dict_save(data, context)
 
@@ -857,7 +856,7 @@ def follow_user(context, data_dict):
 
     if errors:
         model.Session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     # Don't let a user follow herself.
     if userobj.id == data_dict['id']:
@@ -929,7 +928,7 @@ def follow_dataset(context, data_dict):
 
     if errors:
         model.Session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     # Don't let a user follow a dataset she is already following.
     if model.UserFollowingDataset.get(userobj.id, data_dict['id']) is not None:

ckan/logic/action/delete.py

@@ -297,7 +297,7 @@ def unfollow_user(context, data_dict):
             ckan.logic.schema.default_follow_user_schema())
     data_dict, errors = validate(data_dict, schema, context)
     if errors:
-        raise ValidationError(errors, ckan.logic.action.error_summary(errors))
+        raise ValidationError(errors)
 
     _unfollow(context, data_dict, context['model'].UserFollowingUser)
 
@@ -312,6 +312,6 @@ def unfollow_dataset(context, data_dict):
             ckan.logic.schema.default_follow_dataset_schema())
     data_dict, errors = validate(data_dict, schema, context)
     if errors:
-        raise ValidationError(errors, ckan.logic.action.error_summary(errors))
+        raise ValidationError(errors)
 
     _unfollow(context, data_dict, context['model'].UserFollowingDataset)

ckan/logic/action/get.py

@@ -1973,7 +1973,7 @@ def user_follower_count(context, data_dict):
             ckan.logic.schema.default_follow_user_schema())
     data_dict, errors = _validate(data_dict, schema, context)
     if errors:
-        raise ValidationError(errors, ckan.logic.action.error_summary(errors))
+        raise ValidationError(errors)
     return ckan.model.UserFollowingUser.follower_count(data_dict['id'])
 
 def dataset_follower_count(context, data_dict):
@@ -1989,7 +1989,7 @@ def dataset_follower_count(context, data_dict):
             ckan.logic.schema.default_follow_dataset_schema())
     data_dict, errors = _validate(data_dict, schema, context)
     if errors:
-        raise ValidationError(errors, ckan.logic.action.error_summary(errors))
+        raise ValidationError(errors)
     return ckan.model.UserFollowingDataset.follower_count(data_dict['id'])
 
 def _follower_list(context, data_dict, FollowerClass):
@@ -2018,7 +2018,7 @@ def user_follower_list(context, data_dict):
             ckan.logic.schema.default_follow_user_schema())
     data_dict, errors = _validate(data_dict, schema, context)
     if errors:
-        raise ValidationError(errors, ckan.logic.action.error_summary(errors))
+        raise ValidationError(errors)
     return _follower_list(context, data_dict,
             context['model'].UserFollowingUser)
 
@@ -2035,7 +2035,7 @@ def dataset_follower_list(context, data_dict):
             ckan.logic.schema.default_follow_dataset_schema())
     data_dict, errors = _validate(data_dict, schema, context)
     if errors:
-        raise ValidationError(errors, ckan.logic.action.error_summary(errors))
+        raise ValidationError(errors)
     return _follower_list(context, data_dict,
             context['model'].UserFollowingDataset)
 
@@ -2066,7 +2066,7 @@ def am_following_user(context, data_dict):
             ckan.logic.schema.default_follow_user_schema())
     data_dict, errors = _validate(data_dict, schema, context)
     if errors:
-        raise ValidationError(errors, ckan.logic.action.error_summary(errors))
+        raise ValidationError(errors)
 
     return _am_following(context, data_dict,
             context['model'].UserFollowingUser)
@@ -2084,7 +2084,7 @@ def am_following_dataset(context, data_dict):
             ckan.logic.schema.default_follow_dataset_schema())
     data_dict, errors = _validate(data_dict, schema, context)
     if errors:
-        raise ValidationError(errors, ckan.logic.action.error_summary(errors))
+        raise ValidationError(errors)
 
     return _am_following(context, data_dict,
             context['model'].UserFollowingDataset)
@@ -2102,7 +2102,7 @@ def user_followee_count(context, data_dict):
             ckan.logic.schema.default_follow_user_schema())
     data_dict, errors = _validate(data_dict, schema, context)
     if errors:
-        raise ValidationError(errors, ckan.logic.action.error_summary(errors))
+        raise ValidationError(errors)
     return ckan.model.UserFollowingUser.followee_count(data_dict['id'])
 
 def dataset_followee_count(context, data_dict):
@@ -2118,7 +2118,7 @@ def dataset_followee_count(context, data_dict):
             ckan.logic.schema.default_follow_user_schema())
     data_dict, errors = _validate(data_dict, schema, context)
     if errors:
-        raise ValidationError(errors, ckan.logic.action.error_summary(errors))
+        raise ValidationError(errors)
     return ckan.model.UserFollowingDataset.followee_count(data_dict['id'])
 
 def user_followee_list(context, data_dict):
@@ -2134,7 +2134,7 @@ def user_followee_list(context, data_dict):
             ckan.logic.schema.default_follow_user_schema())
     data_dict, errors = _validate(data_dict, schema, context)
     if errors:
-        raise ValidationError(errors, ckan.logic.action.error_summary(errors))
+        raise ValidationError(errors)
 
     # Get the list of Follower objects.
     model = context['model']
@@ -2161,7 +2161,7 @@ def dataset_followee_list(context, data_dict):
             ckan.logic.schema.default_follow_user_schema())
     data_dict, errors = _validate(data_dict, schema, context)
     if errors:
-        raise ValidationError(errors, ckan.logic.action.error_summary(errors))
+        raise ValidationError(errors)
 
     # Get the list of Follower objects.
     model = context['model']

ckan/logic/action/update.py

@@ -20,7 +20,6 @@
 # Ensure they are module-private so that they don't get loaded as available
 # actions in the action API.
 _validate = ckan.lib.navl.dictization_functions.validate
-_error_summary = logic.action.error_summary
 _get_action = logic.get_action
 _check_access = logic.check_access
 NotFound = logic.NotFound
@@ -140,7 +139,7 @@ def related_update(context, data_dict):
 
     if errors:
         model.Session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     related = model_save.related_dict_save(data, context)
     if not context.get('defer_commit'):
@@ -183,7 +182,7 @@ def resource_update(context, data_dict):
 
     if errors:
         model.Session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     rev = model.repo.new_revision()
     rev.author = user
@@ -253,7 +252,7 @@ def package_update(context, data_dict):
 
     if errors:
         model.Session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     rev = model.repo.new_revision()
     rev.author = user
@@ -301,7 +300,7 @@ def package_update_validate(context, data_dict):
 
     if errors:
         model.Session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
     return data
 
 
@@ -362,7 +361,7 @@ def package_relationship_update(context, data_dict):
 
     if errors:
         model.Session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     _check_access('package_relationship_update', context, data_dict)
 
@@ -416,7 +415,7 @@ def group_update(context, data_dict):
     data, errors = _validate(data_dict, schema, context)
     if errors:
         session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     rev = model.repo.new_revision()
     rev.author = user
@@ -514,7 +513,7 @@ def user_update(context, data_dict):
     data, errors = _validate(data_dict, schema, context)
     if errors:
         session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     user = model_save.user_dict_save(data, context)
 
@@ -584,7 +583,7 @@ def task_status_update(context, data_dict):
 
     if errors:
         session.rollback()
-        raise ValidationError(errors, _error_summary(errors))
+        raise ValidationError(errors)
 
     task_status = model_save.task_status_dict_save(data, context)