Fix AttributeError to be compatible with CKAN2.12

Author: alexmorev

ckanext/dcat/logic.py

@@ -147,7 +147,7 @@ def _page_url(page):
         base_url = '%s%s' % (
             base_url, toolkit.request.path)
 
-        params = [p for p in toolkit.request.params.items()
+        params = [p for p in toolkit.request.args.items()
                   if p[0] != 'page' and p[0] in ('modified_since', 'profiles', 'q', 'fq')]
         if params:
             qs = '&'.join(

ckanext/dcat/tests/logic/test_logic.py

@@ -203,7 +203,7 @@ def test_pagination_same_results_than_page_size(self):
     @mock.patch('ckan.plugins.toolkit.request')
     def test_pagination_keeps_only_supported_params(self, mock_request):
 
-        mock_request.params = {'a': 1, 'b': 2, 'modified_since': '2018-03-22', 'profiles': 'schemaorg'}
+        mock_request.args = {'a': 1, 'b': 2, 'modified_since': '2018-03-22', 'profiles': 'schemaorg'}
         mock_request.host_url = 'http://ckan.test.ckan.net'
         mock_request.path = '/feed/catalog.xml'
 
@@ -231,7 +231,7 @@ def test_pagination_keeps_only_supported_params(self, mock_request):
     @mock.patch('ckan.plugins.toolkit.request')
     def test_pagination_with_dcat_base_uri(self, mock_request):
 
-        mock_request.params = {}
+        mock_request.args = {}
         mock_request.host_url = 'http://ckan.test.ckan.net'
         mock_request.path = '/feed/catalog.xml'
 

ckanext/dcat/utils.py

@@ -380,18 +380,17 @@ def check_access_header():
 
 
 def dcat_json_page():
-     data_dict = {
-         'page': toolkit.request.params.get('page'),
-         'modified_since': toolkit.request.params.get('modified_since'),
-     }
+    data_dict = {
+    'page': toolkit.request.args.get('page'),
+    'modified_since': toolkit.request.args.get('modified_since'),
+    }
 
-     try:
-         datasets = toolkit.get_action('dcat_datasets_list')({},
-                                                             data_dict)
-     except toolkit.ValidationError as e:
-         return toolkit.abort(409, str(e))
+    try:
+        datasets = toolkit.get_action('dcat_datasets_list')({}, data_dict)
+    except toolkit.ValidationError as e:
+        return toolkit.abort(409, str(e))
 
-     return datasets
+    return datasets
 
 
 def read_dataset_page(_id, _format):
@@ -428,15 +427,15 @@ def read_catalog_page(_format):
     if not _format:
         return index_endpoint()
 
-    _profiles = toolkit.request.params.get('profiles')
+    _profiles = toolkit.request.args.get('profiles')
     if _profiles:
         _profiles = _profiles.split(',')
 
     data_dict = {
-        'page': toolkit.request.params.get('page'),
-        'modified_since': toolkit.request.params.get('modified_since'),
-        'q': toolkit.request.params.get('q'),
-        'fq': toolkit.request.params.get('fq'),
+        'page': toolkit.request.args.get('page'),
+        'modified_since': toolkit.request.args.get('modified_since'),
+        'q': toolkit.request.args.get('q'),
+        'fq': toolkit.request.args.get('fq'),
         'format': _format,
         'profiles': _profiles,
     }