From 1b650f4e9e68563035fa1bf6015cf0d5994ad2d9 Mon Sep 17 00:00:00 2001 From: kindly Date: Mon, 17 Dec 2012 01:38:56 +0000 Subject: [PATCH] remove all _context calls and session.removes --- ckan/logic/action/create.py | 7 ------- ckan/logic/action/delete.py | 2 -- ckan/logic/action/update.py | 7 ------- ckan/tests/functional/api/model/test_vocabulary.py | 9 +++++---- 4 files changed, 5 insertions(+), 20 deletions(-) diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py index ddf0eee5f01..061200a35a4 100644 --- a/ckan/logic/action/create.py +++ b/ckan/logic/action/create.py @@ -104,8 +104,6 @@ def package_create(context, data_dict): ''' model = context['model'] user = context['user'] - model.Session.remove() - model.Session()._context = context package_type = data_dict.get('type') package_plugin = lib_plugins.lookup_package_plugin(package_type) @@ -179,8 +177,6 @@ def package_create(context, data_dict): def package_create_validate(context, data_dict): model = context['model'] schema = lib_plugins.lookup_package_plugin().form_to_db_schema() - model.Session.remove() - model.Session()._context = context _check_access('package_create',context,data_dict) @@ -867,9 +863,6 @@ def vocabulary_create(context, data_dict): model = context['model'] schema = context.get('schema') or ckan.logic.schema.default_create_vocabulary_schema() - model.Session.remove() - model.Session()._context = context - _check_access('vocabulary_create', context, data_dict) data, errors = _validate(data_dict, schema, context) diff --git a/ckan/logic/action/delete.py b/ckan/logic/action/delete.py index 563c9439d45..c104cde1a85 100644 --- a/ckan/logic/action/delete.py +++ b/ckan/logic/action/delete.py @@ -268,8 +268,6 @@ def task_status_delete(context, data_dict): ''' model = context['model'] id = _get_or_bust(data_dict, 'id') - model.Session.remove() - model.Session()._context = context entity = model.TaskStatus.get(id) diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py index 66e2975c98e..af148b877fb 100644 --- a/ckan/logic/action/update.py +++ b/ckan/logic/action/update.py @@ -107,7 +107,6 @@ def make_latest_pending_package_active(context, data_dict): if not context.get('defer_commit'): session.commit() - session.remove() def related_update(context, data_dict): @@ -129,7 +128,6 @@ def related_update(context, data_dict): id = _get_or_bust(data_dict, "id") schema = context.get('schema') or ckan.logic.schema.default_related_schema() - model.Session.remove() related = model.Related.get(id) context["related"] = related @@ -170,7 +168,6 @@ def resource_update(context, data_dict): user = context['user'] id = _get_or_bust(data_dict, "id") schema = context.get('schema') or ckan.logic.schema.default_update_resource_schema() - model.Session.remove() resource = model.Resource.get(id) context["resource"] = resource @@ -224,8 +221,6 @@ def package_update(context, data_dict): model = context['model'] user = context['user'] name_or_id = data_dict.get("id") or data_dict['name'] - model.Session.remove() - model.Session()._context = context pkg = model.Package.get(name_or_id) if pkg is None: @@ -296,8 +291,6 @@ def package_update_validate(context, data_dict): user = context['user'] id = _get_or_bust(data_dict, "id") - model.Session.remove() - model.Session()._context = context pkg = model.Package.get(id) context["package"] = pkg diff --git a/ckan/tests/functional/api/model/test_vocabulary.py b/ckan/tests/functional/api/model/test_vocabulary.py index f99e432ff4d..0b23e26f8c9 100644 --- a/ckan/tests/functional/api/model/test_vocabulary.py +++ b/ckan/tests/functional/api/model/test_vocabulary.py @@ -42,6 +42,7 @@ def setup(self): ckan.model.Session.commit() self.sysadmin_user = ckan.model.User.get('admin') self.normal_user = ckan.model.User.get('normal') + self.sysadmin_apikey = self.sysadmin_user.apikey def clean_vocab(self): ckan.model.Session.execute('delete from package_tag_revision') @@ -237,7 +238,7 @@ def test_vocabulary_create_with_tags(self): response = self._post('/api/action/vocabulary_create', params=params, extra_environ = {'Authorization': - str(self.sysadmin_user.apikey)}) + str(self.sysadmin_apikey)}) assert response['success'] == True assert response['result'] created_vocab = response['result'] @@ -284,7 +285,7 @@ def test_vocabulary_create_bad_tags(self): response = self.app.post('/api/action/vocabulary_create', params=json.dumps(params), extra_environ = {'Authorization': - str(self.sysadmin_user.apikey)}, + str(self.sysadmin_apikey)}, status=409) assert response.json['success'] == False assert response.json['error'].has_key('tags') @@ -367,7 +368,7 @@ def test_vocabulary_create_invalid_name(self): response = self.app.post('/api/action/vocabulary_create', params=param_string, extra_environ = {'Authorization': - str(self.sysadmin_user.apikey)}, + str(self.sysadmin_apikey)}, status=409) assert response.json['success'] == False assert response.json['error']['name'] @@ -750,7 +751,7 @@ def test_add_tag_invalid_name(self): response = self.app.post('/api/action/tag_create', params=tag_string, extra_environ = {'Authorization': - str(self.sysadmin_user.apikey)}, + str(self.sysadmin_apikey)}, status=409) assert response.json['success'] == False assert response.json['error']['name']