archive/alerta_alerta
0
0
Fork 0
mirror of https://github.com/alerta/alerta.git synced 2025-05-17 22:52:22 +00:00
Code Issues Projects Releases Wiki Activity

refactor: convert formatted strings to f-strings ()

Browse source
This commit is contained in:
Nick Satterly 2021-05-09 14:52:54 +02:00 • committed by GitHub
parent ddd6b784b2
commit 320a92b0fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
52 changed files with 276 additions and 277 deletions
alerta/database/backends/postgres
utils.py

8
alerta/database/backends/postgres/utils.py
View file

@ -36,10 +36,10 @@ class QueryBuilder:
sort_by = sort_by[1:]
valid_sort_params = [k for k, v in valid_params.items() if v[1]]
if sort_by not in valid_sort_params:
raise ApiError("Sorting by '{}' field not supported.".format(sort_by), 400)
raise ApiError(f"Sorting by '{sort_by}' field not supported.", 400)
_, column, direction = valid_params[sort_by]
direction = 'ASC' if direction * reverse == 1 else 'DESC'
sort.append('{} {}'.format(column, direction))
sort.append(f'{column} {direction}')
else:
sort.append('(false)')
return sort
@ -52,7 +52,7 @@ class QueryBuilder:
continue
valid_filter_params = [k for k, v in valid_params.items() if v[0]]
if field.replace('!', '').split('.')[0] not in valid_filter_params:
raise ApiError('Invalid filter parameter: {}'.format(field), 400)
raise ApiError(f'Invalid filter parameter: {field}', 400)
column, _, _ = valid_params[field.replace('!', '').split('.')[0]]
value = params.getlist(field)
@ -61,7 +61,7 @@ class QueryBuilder:
qvars[column] = value
elif field.startswith('attributes.'):
column = field.replace('attributes.', '')
query.append('AND attributes @> %(attr_{})s'.format(column))
query.append(f'AND attributes @> %(attr_{column})s')
qvars['attr_' + column] = {column: value[0]}
elif len(value) == 1:
value = value[0]