some cleanups

setup.py

@@ -90,7 +90,7 @@ def run_setup(modnames, pl_name, pdfium_ver):
         install_requires = [],
     )
 
-    if modnames == [ModuleHelpers] and pl_name != ExtPlats.none:
+    if modnames == [ModuleHelpers] and pl_name != ExtPlats.sdist:
         # do not do this for sdist (none)
         kwargs["name"] += "_helpers"
         kwargs["description"] += " (helpers module)"
@@ -113,9 +113,9 @@ def run_setup(modnames, pl_name, pdfium_ver):
     if ModuleRaw in modnames:
         kwargs["package_dir"]["pypdfium2_raw"] = "src/pypdfium2_raw"
 
-    if ModuleRaw not in modnames or pl_name == ExtPlats.none:
+    if ModuleRaw not in modnames or pl_name == ExtPlats.sdist:
         kwargs["exclude_package_data"] = {"pypdfium2_raw": PLATFILES_GLOB}
-        if pl_name == ExtPlats.none:
+        if pl_name == ExtPlats.sdist:
             kwargs["license_files"] += LICENSES_SDIST
     elif pl_name == ExtPlats.system:
         kwargs["package_data"]["pypdfium2_raw"] = [VersionFN, BindingsFN]
@@ -145,7 +145,7 @@ def main():
     with_prepare, pl_name, pdfium_ver, use_v8 = parse_pl_spec(pl_spec)
     modnames = parse_modspec(modspec)
 
-    if ModuleRaw in modnames and with_prepare and pl_name != ExtPlats.none:
+    if ModuleRaw in modnames and with_prepare and pl_name != ExtPlats.sdist:
         prepare_setup(pl_name, pdfium_ver, use_v8)
     run_setup(modnames, pl_name, pdfium_ver)
 

setupsrc/pypdfium2_setup/craft_packages.py

@@ -75,12 +75,13 @@ def main():
 
 
 def _run_pypi_build(args):
-    run_cmd([sys.executable, "-m", "build", "--skip-dependency-check", "--no-isolation"] + args, cwd=ProjectDir, env=os.environ)
+    # -nx: --no-isolation --skip-dependency-check
+    run_cmd([sys.executable, "-m", "build", "-nx"] + args, cwd=ProjectDir, env=os.environ)
 
 
 def main_pypi(args):
 
-    os.environ[PlatSpec_EnvVar] = ExtPlats.none
+    os.environ[PlatSpec_EnvVar] = ExtPlats.sdist
     with tmp_ctypesgen_pin():
         _run_pypi_build(["--sdist"])
 

setupsrc/pypdfium2_setup/emplace.py

@@ -90,7 +90,7 @@ def main():
     )
     args = parser.parse_args()
 
-    if args.plat_spec == ExtPlats.none:
+    if args.plat_spec == ExtPlats.sdist:
         print("Remove existing in-tree platform files, if any.", file=sys.stderr)
         clean_platfiles()
         return

setupsrc/pypdfium2_setup/packaging_base.py

@@ -81,8 +81,7 @@ class SysNames:
 class ExtPlats:
     sourcebuild = "sourcebuild"
     system = "system"
-    none = "none"  # FIXME rename to sdist?
-    auto = "auto"
+    sdist = "sdist"
 
 # TODO align with either python or google platform names?
 class PlatNames:
@@ -596,7 +595,7 @@ def parse_pl_spec(pl_spec, with_prepare=True):
         pl_spec = pl_spec[:-len(PlatSpec_V8Sym)]
         use_v8 = True
 
-    if not pl_spec or pl_spec == ExtPlats.auto:
+    if not pl_spec or pl_spec == "auto":
         pl_name = Host.platform
         if pl_name is None:
             raise RuntimeError(f"No pre-built binaries available for {Host}. You may place custom binaries & bindings in data/sourcebuild and install with `{PlatSpec_EnvVar}=sourcebuild`.")

src/pypdfium2/internal/bases.py

@@ -32,10 +32,7 @@ def _as_parameter_(self):
 def _close_template(close_func, raw, obj_repr, state, parent, *args, **kwargs):
 
     if DEBUG_AUTOCLOSE:
-        state = state.value
-        desc = "auto" if state == STATE_AUTO else "explicit" if state == STATE_EXPLICIT else "by parent" if state == STATE_BYPARENT else None
-        if desc is None:
-            raise
+        desc = {STATE_AUTO: "auto", STATE_EXPLICIT: "explicit", STATE_BYPARENT: "by parent"}[state.value]
         # use os.write() rather than print() to avoid "reentrant call" exceptions on shutdown (see https://stackoverflow.com/q/75367828/15547292)
         os.write(sys.stderr.fileno(), f"Close ({desc}) {obj_repr}\n".encode())