flynt more files; lint more.

Author: rocky

test/test_pyenvlib.py

@@ -200,7 +200,7 @@ def file_matches(files, root, basenames, patterns):
     print("Processed %d files, total" % (i + 1))
     print(time.ctime())
     elapsed_time = time.time() - start_time
-    print("%g seconds" % elapsed_time)
+    print(f"{elapsed_time:g} seconds")
     os.chdir(cwd)
 
 
@@ -273,4 +273,4 @@ def file_matches(files, root, basenames, patterns):
                 do_compile=do_compile,
             )
         else:
-            print("### Path %s doesn't exist; skipping" % src_dir)
+            print(f"### Path {src_dir} doesn't exist; skipping")

test/test_pythonlib.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# emacs-mode: -*-python-*-
 
 """
 test_pythonlib.py -- disassemble Python libraries
@@ -109,11 +108,11 @@ def get_srcdir():
     "3.12",
     "3.13",
 ):
-    bytecode = "bytecode_%s" % vers
-    key = "bytecode-%s" % vers
+    bytecode = f"bytecode_{vers}"
+    key = f"bytecode-{vers}"
     test_options[key] = (os.path.join(src_dir, bytecode), PYC, bytecode, vers)
-    key = "%s" % vers
-    pythonlib = "python%s" % vers
+    key = vers
+    pythonlib = f"python{vers}"
     if isinstance(vers, float) and vers >= 3.0:
         pythonlib = os.path.join(src_dir, pythonlib, "__pycache__")
     test_options[key] = (os.path.join(lib_prefix, pythonlib), PYOC, pythonlib, vers)
@@ -129,10 +128,10 @@ def get_srcdir():
     (312, 3.12),
     (313, 3.13),
 ):
-    bytecode = "bytecode_pypy%s" % vers
-    key = "bytecode-pypy%s" % vers
+    bytecode = f"bytecode_pypy{vers}"
+    key = f"bytecode-pypy{vers}"
     test_options[key] = (os.path.join(src_dir, bytecode), PYOC, bytecode, vers_dot)
-    key = "bytecode-pypy%s" % vers_dot
+    key = f"bytecode-pypy{vers_dot}"
     test_options[key] = (os.path.join(src_dir, bytecode), PYOC, bytecode, vers_dot)
 
 
@@ -246,7 +245,7 @@ def file_matches(files, root, basenames, patterns):
     checked_dirs = []
     start_with = None
 
-    test_options_keys = list(test_options.keys())
+    test_options_keys = [str(k) for k in test_options.keys()]
     test_options_keys.sort()
     opts, args = getopt.getopt(
         sys.argv[1:],
@@ -287,7 +286,7 @@ def file_matches(files, root, basenames, patterns):
         if os.path.isdir(src_dir):
             checked_dirs.append([src_dir, pattern, target_dir])
         else:
-            sys.stderr.write("Can't find directory %s. Skipping\n" % src_dir)
+            sys.stderr.write(f"Can't find directory {src_dir}. Skipping\n")
             continue
         last_compile_version = compiled_version
         pass

xdis/roundtrip_pyc.py

@@ -179,7 +179,7 @@ def load_meta_and_code_from_filename(path: str):
         return load_module_from_file_object(fp, filename=path, get_code=True)
 
 
-def roundtrip_pyc(input_path: str, unlink_on_success) -> int:
+def roundtrip_pyc(input_path: str, unlink_on_success: bool) -> int:
 
     # parser = argparse.ArgumentParser(
     #     description="Load a .pyc with xdis, rewrite it to a temporary file, and compare."