voussoir
/
etiquette
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace more %s with fstrings.

master
voussoir 2020-04-15 16:29:56 -07:00
parent d7dc179ac5
commit 43a665fd91
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etiquette/photodb.py
View File

@ -562,7 +562,7 @@ class PDBPhotoMixin:
wheres.append('extension != ""') wheres.append('extension != ""')
else: else:
qmarks = ', '.join('?' * len(extension)) qmarks = ', '.join('?' * len(extension))
wheres.append('extension IN (%s)' % qmarks) wheres.append(f'extension IN ({qmarks})')
bindings.extend(extension) bindings.extend(extension)
if extension_not: if extension_not:
@ -570,7 +570,7 @@ class PDBPhotoMixin:
wheres.append('extension == ""') wheres.append('extension == ""')
else: else:
qmarks = ', '.join('?' * len(extension_not)) qmarks = ', '.join('?' * len(extension_not))
wheres.append('extension NOT IN (%s)' % qmarks) wheres.append(f'extension NOT IN ({qmarks})')
bindings.extend(extension_not) bindings.extend(extension_not)
if mimetype: if mimetype:
@ -616,7 +616,7 @@ class PDBPhotoMixin:
query.append(wheres) query.append(wheres)
if orderby: if orderby:
orderby = ['%s %s' % (column, direction) for (column, direction) in orderby] orderby = [f'{column} {direction}' for (column, direction) in orderby]
orderby = ', '.join(orderby) orderby = ', '.join(orderby)
orderby = 'ORDER BY ' + orderby orderby = 'ORDER BY ' + orderby
query.append(orderby) query.append(orderby)
@ -1048,7 +1048,7 @@ class PDBUserMixin:
author_id = self.get_user(id=user_obj_or_id).id author_id = self.get_user(id=user_obj_or_id).id
else: else:
raise TypeError('Unworkable type %s' % type(user_obj_or_id)) raise TypeError(f'Unworkable type {type(user_obj_or_id)}')
return author_id return author_id
@ -1456,7 +1456,7 @@ class PhotoDB(
''' '''
table = table.lower() table = table.lower()
if table not in ['photos', 'tags', 'albums', 'bookmarks']: if table not in ['photos', 'tags', 'albums', 'bookmarks']:
raise ValueError('Invalid table requested: %s.', table) raise ValueError(f'Invalid table requested: {table}.')
last_id = self.sql_select_one('SELECT last_id FROM id_numbers WHERE tab == ?', [table]) last_id = self.sql_select_one('SELECT last_id FROM id_numbers WHERE tab == ?', [table])
if last_id is None: if last_id is None: