From d884b6d896f8076d7223414640775807e6d95eaf Mon Sep 17 00:00:00 2001 From: Vitor Baptista Date: Wed, 28 May 2014 22:06:35 -0300 Subject: [PATCH] [#1725] Rename IDataStore -> IDatastore This makes it consistent with the plugin name (DatastorePlugin). --- ckanext/datastore/db.py | 6 +++--- ckanext/datastore/interfaces.py | 4 ++-- ckanext/datastore/plugin.py | 2 +- ckanext/datastore/tests/sample_datastore_plugin.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py index 597fe738a08..1b428afe484 100644 --- a/ckanext/datastore/db.py +++ b/ckanext/datastore/db.py @@ -799,7 +799,7 @@ def delete_data(context, data_dict): 'where': [] } - for plugin in p.PluginImplementations(interfaces.IDataStore): + for plugin in p.PluginImplementations(interfaces.IDatastore): query_dict = plugin.delete_data(context, data_dict, query_dict, field_ids) @@ -826,7 +826,7 @@ def validate_query(context, data_dict): fields = datastore_helpers.get_list(data_dict_copy['fields']) data_dict_copy['fields'] = fields - for plugin in p.PluginImplementations(interfaces.IDataStore): + for plugin in p.PluginImplementations(interfaces.IDatastore): data_dict_copy = plugin.validate_query(context, data_dict_copy, all_field_ids) @@ -862,7 +862,7 @@ def search_data(context, data_dict): 'where': [] } - for plugin in p.PluginImplementations(interfaces.IDataStore): + for plugin in p.PluginImplementations(interfaces.IDatastore): query_dict = plugin.search_data(context, data_dict, query_dict, all_field_ids) diff --git a/ckanext/datastore/interfaces.py b/ckanext/datastore/interfaces.py index fb323ef077e..80ba8232264 100644 --- a/ckanext/datastore/interfaces.py +++ b/ckanext/datastore/interfaces.py @@ -1,8 +1,8 @@ import ckan.plugins.interfaces as interfaces -class IDataStore(interfaces.Interface): - '''Allow changing DataStore queries''' +class IDatastore(interfaces.Interface): + '''Allow changing Datastore queries''' def search_data(self, context, data_dict, query_dict, all_field_ids): return query_dict diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py index 7952015871c..499b51749a0 100644 --- a/ckanext/datastore/plugin.py +++ b/ckanext/datastore/plugin.py @@ -34,7 +34,7 @@ class DatastorePlugin(p.SingletonPlugin): p.implements(p.IDomainObjectModification, inherit=True) p.implements(p.IRoutes, inherit=True) p.implements(p.IResourceController, inherit=True) - p.implements(interfaces.IDataStore, inherit=True) + p.implements(interfaces.IDatastore, inherit=True) legacy_mode = False resource_show_action = None diff --git a/ckanext/datastore/tests/sample_datastore_plugin.py b/ckanext/datastore/tests/sample_datastore_plugin.py index f177794465b..c86541ee5ee 100644 --- a/ckanext/datastore/tests/sample_datastore_plugin.py +++ b/ckanext/datastore/tests/sample_datastore_plugin.py @@ -4,7 +4,7 @@ class SampleDataStorePlugin(p.SingletonPlugin): - p.implements(interfaces.IDataStore, inherit=True) + p.implements(interfaces.IDatastore, inherit=True) def validate_query(self, context, data_dict, all_field_ids): valid_filters = ('age_between', 'age_not_between')