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

Revert f-strings to %s for logging calls.

Browse source 
In my excitement I forgot about that rule.
This commit is contained in:
voussoir 2018-07-29 16:01:26 -07:00
parent f047235c48
commit 56e7472c93
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
etiquette/objects.py
View file

@ -90,7 +90,7 @@ class GroupableMixin:
if self.has_child(member): if self.has_child(member):
return return
self.photodb.log.debug(f'Adding child {member} to {self}.') self.photodb.log.debug('Adding child %s to %s.', member, self)
for my_ancestor in self.walk_parents(): for my_ancestor in self.walk_parents():
if my_ancestor == member: if my_ancestor == member:
@ -194,7 +194,7 @@ class GroupableMixin:
if not self.has_child(member): if not self.has_child(member):
return return
self.photodb.log.debug(f'Removing child {member} from {self}.') self.photodb.log.debug('Removing child %s from %s.', member, self)
pairs = { pairs = {
'parentid': self.id, 'parentid': self.id,
@ -700,13 +700,13 @@ class Photo(ObjectBase):
# keep our current one. # keep our current one.
existing = self.has_tag(tag, check_children=True) existing = self.has_tag(tag, check_children=True)
if existing: if existing:
self.photodb.log.debug(f'Preferring existing {existing} over {tag}') self.photodb.log.debug('Preferring existing %s over %s', existing, tag)
return existing return existing
# If the new tag is more specific, remove our current one for it. # If the new tag is more specific, remove our current one for it.
for parent in tag.walk_parents(): for parent in tag.walk_parents():
if self.has_tag(parent, check_children=False): if self.has_tag(parent, check_children=False):
self.photodb.log.debug(f'Preferring new {tag} over {parent}') self.photodb.log.debug('Preferring new %s over %s', tag, parent)
self.remove_tag(parent, commit=False) self.remove_tag(parent, commit=False)
self.photodb.log.debug('Applying %s to %s', tag, self) self.photodb.log.debug('Applying %s to %s', tag, self)