fix abi_thread check

marcelotduarte · Dec 30, 2024 · 5bf9817 · 5bf9817
1 parent d81b59e
commit 5bf9817
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cx_Freeze/executable.py b/cx_Freeze/executable.py
@@ -79,7 +79,7 @@ def base(self, name: str | Path | None) -> None:
         version = sys.version_info[:2]
         if (
             version <= (3, 13)
-            and get_config_var("abi_thread") is None
+            and (get_config_var("abi_thread") or "") == ""
             and not (IS_MACOS and version == (3, 13))
         ):
             name = name or "console_legacy"

diff --git a/setup.py b/setup.py
@@ -276,7 +276,7 @@ def get_extensions() -> list[Extension]:
         os.environ.get("CI", "") != "true"
         or os.environ.get("CIBUILDWHEEL", "0") != "1"
     )
-    abi_thread = get_config_var("abi_thread")
+    abi_thread = get_config_var("abi_thread") or ""
     version = sys.version_info[:2]
     extensions = [
         Extension(
@@ -287,7 +287,7 @@ def get_extensions() -> list[Extension]:
     ]
     if (
         version <= (3, 13)
-        and abi_thread is None
+        and abi_thread == ""
         and not (IS_MACOS and version == (3, 13))
     ):
         extensions += [
@@ -299,7 +299,7 @@ def get_extensions() -> list[Extension]:
             )
         ]
     if IS_MINGW or IS_WINDOWS:
-        if version <= (3, 13) and abi_thread is None:
+        if version <= (3, 13) and abi_thread == "":
             extensions += [
                 Extension(
                     "cx_Freeze.bases.Win32GUI",

diff --git a/tests/test_executables.py b/tests/test_executables.py
@@ -244,7 +244,7 @@ def test_executables(
 ]
 if (
     sys.version_info[:2] <= (3, 13)
-    and get_config_var("abi_thread") is None
+    and (get_config_var("abi_thread") or "") == ""
     and not (IS_MACOS and sys.version_info[:2] == (3, 13))
 ):
     TEST_VALID_PARAMETERS += [