Automated conversion of % format specifiers

Using ruff. Does not change any translatable strings.
There are still several thousand usages of % left that ruff wont
auto-convert. Get to them someday.

Author: kovidgoyal

icons/icns/make_iconsets.py

@@ -27,7 +27,7 @@
     try:
         for sz in (16, 32, 128, 256, 512, 1024):
             iname = f'icon_{sz}x{sz}.png'
-            iname2x = 'icon_{0}x{0}@2x.png'.format(sz // 2)
+            iname2x = f'icon_{sz // 2}x{sz // 2}@2x.png'
             if src.endswith('.svg'):
                 subprocess.check_call(['rsvg-convert', src, '-w', str(sz), '-h', str(sz), '-o', iname])
             else:

setup/build.py

@@ -656,7 +656,7 @@ def build_headless(self):
         os.chdir(bdir)
         try:
             self.check_call(cmd + ['-S', os.path.dirname(sources[0])])
-            self.check_call([self.env.make] + ['-j{}'.format(cpu_count or 1)])
+            self.check_call([self.env.make] + [f'-j{cpu_count or 1}'])
         finally:
             os.chdir(cwd)
         os.rename(self.j(bdir, 'libheadless.so'), target)
@@ -733,7 +733,7 @@ def build_pyqt_extension(self, ext, sbf):
             env = os.environ.copy()
             if is_macos_universal_build:
                 env['ARCHS'] = 'x86_64 arm64'
-            self.check_call([self.env.make] + ([] if iswindows else ['-j{}'.format(os.cpu_count() or 1)]), env=env)
+            self.check_call([self.env.make] + ([] if iswindows else [f'-j{os.cpu_count() or 1}']), env=env)
             e = 'pyd' if iswindows else 'so'
             m = glob.glob(f'{ext.name}/{ext.name}.*{e}')
             if not m:

setup/check.py

@@ -114,7 +114,7 @@ def run_check_files(self):
             for i, f in enumerate(dirty_files):
                 self.info('\tChecking', f)
                 if self.file_has_errors(f):
-                    self.info('{} files left to check'.format(len(dirty_files) - i - 1))
+                    self.info(f'{len(dirty_files) - i - 1} files left to check')
                     try:
                         edit_file(f)
                     except FileNotFoundError:

setup/hosting.py

@@ -56,16 +56,16 @@ def report_progress(self, size):
         eta = int((self._total - self.tell()) / bit_rate) + 1
         eta_m, eta_s = eta / 60, eta % 60
         sys.stdout.write(
-            '  {:.1f}%   {:.1f}/{:.1f}MB {:.1f} KB/sec    {} minutes, {} seconds left'
-            .format(frac * 100, mb_pos, mb_tot, kb_rate, eta_m, eta_s)
+            f'  {frac * 100:.1f}%   {mb_pos:.1f}/{mb_tot:.1f}MB {kb_rate:.1f} KB/sec    {eta_m} minutes, {eta_s} seconds left'
+
         )
         sys.stdout.write('\x1b[u')
         if self.tell() >= self._total:
             sys.stdout.write('\n')
             t = int(time.time() - self.start_time) + 1
             print(
-                'Upload took {} minutes and {} seconds at {:.1f} KB/sec'
-                .format(t/60, t % 60, kb_rate)
+                f'Upload took {t/60} minutes and {t % 60} seconds at {kb_rate:.1f} KB/sec'
+
             )
         sys.stdout.flush()
 

setup/install.py

@@ -388,7 +388,7 @@ def pre_sub_commands(self, opts):
             st = time.time()
             clone_cmd.insert(2, '--depth=1')
             subprocess.check_call(clone_cmd, cwd=self.d(self.SRC))
-            print('Downloaded translations in {} seconds'.format(int(time.time() - st)))
+            print(f'Downloaded translations in {int(time.time() - st)} seconds')
         else:
             if os.path.exists(tdir):
                 subprocess.check_call(['git', 'pull'], cwd=tdir)

setup/plugins_mirror.py

@@ -460,7 +460,7 @@ def plugin_to_index(plugin, count):
     released = datetime(*tuple(map(int, re.split(r'\D', plugin['last_modified'])))[:6]).strftime('%e %b, %Y').lstrip()
     details = [
         'Version: <b>{}</b>'.format(escape('.'.join(map(str, plugin['version'])))),
-        'Released: <b>{}</b>'.format(escape(released)),
+        f'Released: <b>{escape(released)}</b>',
         'Author: {}'.format(escape(plugin['author'])),
         'calibre: {}'.format(escape('.'.join(map(str, plugin['minimum_calibre_version'])))),
         'Platforms: {}'.format(escape(', '.join(sorted(plugin['supported_platforms']) or ['all']))),

setup/publish.py

@@ -50,9 +50,9 @@ def run(self, opts):
         platforms = 'linux64', 'linuxarm64', 'osx', 'win'
         for x in platforms:
             cmd = (
-                '''{exe} -c "import subprocess; subprocess.Popen(['{exe}', './setup.py', '{x}']).wait() != 0 and'''
-                ''' input('Build of {x} failed, press Enter to exit');"'''
-            ).format(exe=sys.executable, x=x)
+                f'''{sys.executable} -c "import subprocess; subprocess.Popen(['{sys.executable}', './setup.py', '{x}']).wait() != 0 and'''
+                f''' input('Build of {x} failed, press Enter to exit');"'''
+            )
             session.append('title ' + x)
             session.append('launch ' + cmd)
 
@@ -220,8 +220,8 @@ def run(self, opts):
                 if x and not os.path.exists(x):
                     os.symlink('.', x)
             self.info(
-                'Built manual for {} languages in {} minutes'
-                .format(len(jobs), int((time.time() - st) / 60.))
+                f'Built manual for {len(jobs)} languages in {int((time.time() - st) / 60.)} minutes'
+
             )
         finally:
             os.chdir(cwd)
@@ -335,6 +335,6 @@ class TagRelease(Command):
     def run(self, opts):
         self.info('Tagging release')
         subprocess.check_call(
-            'git tag -s v{0} -m "version-{0}"'.format(__version__).split()
+            f'git tag -s v{__version__} -m "version-{__version__}"'.split()
         )
         subprocess.check_call(f'git push origin v{__version__}'.split())

setup/upload.py

@@ -361,12 +361,11 @@ class UploadDemo(Command):  # {{{
 
     def run(self, opts):
         check_call(
-            '''ebook-convert {}/demo.html /tmp/html2lrf.lrf '''
+            f'''ebook-convert {self.j(self.SRC, HTML2LRF)}/demo.html /tmp/html2lrf.lrf '''
             '''--title='Demonstration of html2lrf' --authors='Kovid Goyal' '''
             '''--header '''
             '''--serif-family "/usr/share/fonts/corefonts, Times New Roman" '''
-            '''--mono-family  "/usr/share/fonts/corefonts, Andale Mono" '''
-            ''''''.format(self.j(self.SRC, HTML2LRF)),
+            '''--mono-family  "/usr/share/fonts/corefonts, Andale Mono" ''',
             shell=True
         )
 

setup/win-ci.py

@@ -98,7 +98,7 @@ def main():
     else:
         if len(sys.argv) == 1:
             raise SystemExit('Usage: win-ci.py sw|build|test')
-        raise SystemExit('{!r} is not a valid action'.format(sys.argv[-1]))
+        raise SystemExit(f'{sys.argv[-1]!r} is not a valid action')
 
 
 if __name__ == '__main__':

src/calibre/__init__.py

@@ -292,7 +292,7 @@ def get_proxy_info(proxy_scheme, proxy_string):
     '''
     from polyglot.urllib import urlparse
     try:
-        proxy_url = '%s://%s'%(proxy_scheme, proxy_string)
+        proxy_url = f'{proxy_scheme}://{proxy_string}'
         urlinfo = urlparse(proxy_url)
         ans = {
             'scheme': urlinfo.scheme,