Skip to content

Commit d7de549

Browse files
author
Aleksandar Jovanov
committed
Fix PEP8 errors
1 parent 57413ee commit d7de549

4 files changed

Lines changed: 17 additions & 22 deletions

File tree

ckanext/requestdata/controllers/admin.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
NotFound = logic.NotFound
2424
NotAuthorized = logic.NotAuthorized
2525

26-
c = base.c
2726
redirect = base.redirect
2827
abort = base.abort
2928

@@ -156,8 +155,7 @@ def requests_data(self):
156155
package =\
157156
_get_action('package_show', {'id': x['package_id']})
158157
count = \
159-
_get_action(
160-
'requestdata_request_data_counters_get',
158+
_get_action('requestdata_request_data_counters_get',
161159
{'package_id': x['package_id']})
162160
if count:
163161
x['shared'] = count.shared

ckanext/requestdata/controllers/organization.py

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ def requested_data(self, id):
109109
package = \
110110
_get_action('package_show', {'id': x['package_id']})
111111
count = \
112-
_get_action(
113-
'requestdata_request_data_counters_get',
112+
_get_action('requestdata_request_data_counters_get',
114113
{'package_id': x['package_id']})
115114
x['title'] = package['title']
116115
x['shared'] = count.shared
@@ -219,14 +218,12 @@ def requested_data(self, id):
219218
dataset.update(data)
220219

221220
if organ['name'] == q_organization:
222-
grouped_requests_archive = sorted(
223-
grouped_requests_archive,
224-
key=lambda x: x[order],
225-
reverse=reverse)
221+
grouped_requests_archive = sorted(grouped_requests_archive,
222+
key=lambda x: x[order],
223+
reverse=reverse)
226224

227225
counters =\
228-
_get_action(
229-
'requestdata_request_data_counters_get_by_org',
226+
_get_action('requestdata_request_data_counters_get_by_org',
230227
{'org_id': organ['id']})
231228

232229
extra_vars = {

ckanext/requestdata/controllers/request_data.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ def _get_email_configuration(
9090
email_footer = email_footer.replace(avaiable_terms[i], new_terms[i])
9191

9292
if only_org_admins:
93-
owner_org = _get_action(
94-
'package_show',
93+
owner_org = _get_action('package_show',
9594
{'id': dataset_name}).get('owner_org')
9695
url = toolkit.url_for('requestdata_organization_requests',
9796
id=owner_org, qualified=True)
@@ -168,7 +167,7 @@ def send_request(self):
168167
error = {
169168
'success': False,
170169
'error': {
171-
'fields': e.error_dict
170+
'fields': e.error_dict
172171
}
173172
}
174173

@@ -178,7 +177,6 @@ def send_request(self):
178177
package = _get_action('package_show', data_dict)
179178
sender_name = data.get('sender_name', '')
180179
user_obj = context['auth_user_obj']
181-
user_name = user_obj.fullname
182180
data_dict = {
183181
'id': user_obj.id,
184182
'permission': 'read'
@@ -261,9 +259,9 @@ def send_request(self):
261259
'package_id': data['package_id'],
262260
'flag': 'request'
263261
}
264-
_get_action(
265-
'requestdata_increment_request_data_counters',
266-
data_dict)
262+
263+
action_name = 'requestdata_increment_request_data_counters'
264+
_get_action(action_name, data_dict)
267265

268266
return json.dumps(response_message)
269267
else:

ckanext/requestdata/controllers/user.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,8 +270,9 @@ def handle_new_request_action(self, username, request_action):
270270
'success': True,
271271
'message': 'Message was sent successfully'
272272
}
273-
get_action('requestdata_increment_request_data_counters')
274-
({}, counters_data_dict)
273+
274+
action_name = 'requestdata_increment_request_data_counters'
275+
_get_action(action_name, counters_data_dict)
275276

276277
return json.dumps(success)
277278

@@ -302,8 +303,9 @@ def handle_open_request_action(self, username, request_action):
302303
else:
303304
data_dict['flag'] = 'declined'
304305

305-
get_action('requestdata_increment_request_data_counters')
306-
({}, data_dict)
306+
action_name = 'requestdata_increment_request_data_counters'
307+
_get_action(action_name)(data_dict)
308+
307309
try:
308310
_get_action('requestdata_request_patch', data)
309311
except NotAuthorized:

0 commit comments

Comments
 (0)