.format() to f-string from previous PR

kovidgoyal · Jan 28, 2025 · 0b4a3a8 · 0b4a3a8
1 parent 9c5e88c
commit 0b4a3a8
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/calibre/ebooks/mobi/reader/markup.py b/src/calibre/ebooks/mobi/reader/markup.py
@@ -80,7 +80,7 @@ def remove_kindlegen_markup(parts, aid_anchor_suffix, linked_aids):
                         aid = None
                     replacement = ''
                     if aid in linked_aids:
-                        replacement = ' id="{}"'.format(aid + '-' + aid_anchor_suffix)
+                        replacement = f' id="{aid + "-" + aid_anchor_suffix}"'
                     tag = within_tag_aid_position_pattern.sub(replacement, tag, 1)
                 srcpieces[j] = tag
         part = ''.join(srcpieces)
@@ -150,7 +150,7 @@ def flow_as_unicode(flow):
                     num = int(m.group(1), 32)
                     href = resource_map[num-1]
                     if href:
-                        replacement = '"{}"'.format('../'+ href)
+                        replacement = f'"{"../"+ href}"'
                         tag = img_index_pattern.sub(replacement, tag, 1)
                     else:
                         log.warn(f'Referenced image {num} was not recognized '
@@ -168,7 +168,7 @@ def flow_as_unicode(flow):
                 num = int(m.group(1), 32)
                 href = resource_map[num-1]
                 if href:
-                    replacement = '"{}"'.format('../'+ href)
+                    replacement = f'"{"../"+ href}"'
                     tag = url_img_index_pattern.sub(replacement, tag, 1)
                 else:
                     log.warn(f'Referenced image {num} was not recognized as a '
@@ -182,9 +182,9 @@ def flow_as_unicode(flow):
                     log.warn(f'Referenced font {num} was not recognized as a '
                     f'valid font in {tag}')
                 else:
-                    replacement = '"{}"'.format('../'+ href)
+                    replacement = f'"{"../"+ href}"'
                     if href.endswith('.failed'):
-                        replacement = '"{}"'.format('failed-'+href)
+                        replacement = f'"{"failed-"+href}"'
                     tag = font_index_pattern.sub(replacement, tag, 1)
 
             # process links to other css pieces
@@ -280,7 +280,7 @@ def insert_images_into_markup(parts, resource_map, log):
                     except IndexError:
                         href = ''
                     if href:
-                        replacement = '"{}"'.format('../' + href)
+                        replacement = f'"{"../" + href}"'
                         tag = img_index_pattern.sub(replacement, tag, 1)
                     else:
                         log.warn(f'Referenced image {num} was not recognized as '