Nuitka-winsvc 2.3.11__cp311-cp311-win_amd64.whl → 2.4.5__cp311-cp311-win_amd64.whl

nuitka/code_generation/templates/CodeTemplatesConstants.py

@@ -3,6 +3,7 @@
 
 """ Templates for the constants handling.
 
+spell-checker: ignore structseq
 """
 
 template_constants_reading = r"""
@@ -56,12 +57,16 @@ NUITKA_MAY_BE_UNUSED static PyObject *STRIP_DIRNAME(PyObject *path) {
 }
 #endif
 
-extern void setDistributionsMetadata(PyObject *metadata_values);
+extern void setDistributionsMetadata(PyThreadState *tstate, PyObject *metadata_items);
 
 // We provide the sys.version info shortcut as a global value here for ease of use.
 PyObject *Py_SysVersionInfo = NULL;
 
+#if defined(_NUITKA_MODULE) && PYTHON_VERSION >= 0x3c0
+static void _createGlobalConstants(PyThreadState *tstate, PyObject *real_module_name) {
+#else
 static void _createGlobalConstants(PyThreadState *tstate) {
+#endif
     // We provide the sys.version info shortcut as a global value here for ease of use.
     Py_SysVersionInfo = Nuitka_SysGetObject("version_info");
 
@@ -113,7 +118,8 @@ static void _createGlobalConstants(PyThreadState *tstate) {
 
     static PyTypeObject Nuitka_VersionInfoType;
 
-    // Same fields as "sys.version_info" except no serial number.
+    // Same fields as "sys.version_info" except no serial number
+    // spell-checker: ignore releaselevel
     static PyStructSequence_Field Nuitka_VersionInfoFields[] = {
         {(char *)"major", (char *)"Major release number"},
         {(char *)"minor", (char *)"Minor release number"},
@@ -150,7 +156,6 @@ static void _createGlobalConstants(PyThreadState *tstate) {
     PyStructSequence_SET_ITEM(Nuitka_dunder_compiled_value, 3, Nuitka_String_FromString("%(nuitka_version_level)s"));
 
     PyObject *binary_directory = getContainingDirectoryObject(false);
-    binary_directory = OS_PATH_ABSPATH(tstate, binary_directory);
 #ifdef _NUITKA_STANDALONE
 #ifndef _NUITKA_ONEFILE_MODE
     binary_directory = STRIP_DIRNAME(binary_directory);
@@ -215,11 +220,15 @@ static void _createGlobalConstants(PyThreadState *tstate) {
 #ifdef _NUITKA_MODULE
     PyObject *main_name;
 
+#if PYTHON_VERSION < 0x3c0
     if (_Py_PackageContext != NULL) {
         main_name = Nuitka_String_FromString(_Py_PackageContext);
     } else {
         main_name = Nuitka_String_FromString(%(module_name_cstr)s);
     }
+#else
+    main_name = real_module_name;
+#endif
 #else
     PyObject *main_name = Nuitka_String_FromString("__main__");
 #endif
@@ -229,7 +238,8 @@ static void _createGlobalConstants(PyThreadState *tstate) {
     Nuitka_VersionInfoType.tp_init = NULL;
     Nuitka_VersionInfoType.tp_new = NULL;
 
-    setDistributionsMetadata(%(metadata_values)s);
+    // Register included meta data.
+    setDistributionsMetadata(tstate, %(metadata_values)s);
 }
 
 // In debug mode we can check that the constants were not tampered with in any
@@ -242,7 +252,11 @@ void checkGlobalConstants(void) {
 }
 #endif
 
+#if defined(_NUITKA_MODULE) && PYTHON_VERSION >= 0x3c0
+void createGlobalConstants(PyThreadState *tstate, PyObject *real_module_name) {
+#else
 void createGlobalConstants(PyThreadState *tstate) {
+#endif
     if (Nuitka_sentinel_value == NULL) {
 #if PYTHON_VERSION < 0x300
         Nuitka_sentinel_value = PyCObject_FromVoidPtr(NULL, NULL);
@@ -254,7 +268,11 @@ void createGlobalConstants(PyThreadState *tstate) {
 
         Py_SET_REFCNT_IMMORTAL(Nuitka_sentinel_value);
 
+#if defined(_NUITKA_MODULE) && PYTHON_VERSION >= 0x3c0
+        _createGlobalConstants(tstate, real_module_name);
+#else
         _createGlobalConstants(tstate);
+#endif
     }
 }
 """

nuitka/code_generation/templates/CodeTemplatesLoader.py

@@ -82,7 +82,7 @@ void setupMetaPathBasedLoader(PyThreadState *tstate) {
     static bool init_done = false;
     if (init_done == false) {
         _loadBytesCodesBlob(tstate);
-        registerMetaPathBasedUnfreezer(meta_path_loader_entries, bytecode_data);
+        registerMetaPathBasedLoader(meta_path_loader_entries, bytecode_data);
 
         init_done = true;
     }

nuitka/code_generation/templates/CodeTemplatesModules.py

@@ -59,7 +59,7 @@ static bool constants_created = false;
 /* Function to create module private constants. */
 static void createModuleConstants(PyThreadState *tstate) {
     if (constants_created == false) {
-        loadConstantsBlob(tstate, &mod_consts[0], UNTRANSLATE(%(module_const_blob_name)s));
+        loadConstantsBlob(tstate, &mod_consts[0], UN_TRANSLATE(%(module_const_blob_name)s));
         constants_created = true;
 
 #ifndef __NUITKA_NO_ASSERT__
@@ -164,7 +164,7 @@ static PyObject *_reduce_compiled_function(PyObject *self, PyObject *args, PyObj
 
     if (offset == -5) {
         CHECK_OBJECT(function->m_constant_return_value);
-        PyTuple_SET_ITEM0(result, 5, function->m_constant_return_value);
+        PyTuple_SET_ITEM_IMMORTAL(result, 5, function->m_constant_return_value);
     } else {
         PyTuple_SET_ITEM_IMMORTAL(result, 5, Py_None);
     }
@@ -251,6 +251,11 @@ static PyMethodDef _method_def_create_compiled_function = {
 
 #endif
 
+// Actual name might be different when loaded as a package.
+#if defined(_NUITKA_MODULE) && %(is_top)d
+static char const *module_full_name = %(module_name_cstr)s;
+#endif
+
 // Internal entry point for module code.
 PyObject *modulecode_%(module_identifier)s(PyThreadState *tstate, PyObject *module, struct Nuitka_MetaPathBasedLoaderEntry const *loader_entry) {
     // Report entry to PGO.
@@ -259,6 +264,8 @@ PyObject *modulecode_%(module_identifier)s(PyThreadState *tstate, PyObject *modu
     // Store the module for future use.
     module_%(module_identifier)s = module;
 
+    moduledict_%(module_identifier)s = MODULE_DICT(module_%(module_identifier)s);
+
     // Modules can be loaded again in case of errors, avoid the init being done again.
     static bool init_done = false;
 
@@ -272,8 +279,18 @@ PyObject *modulecode_%(module_identifier)s(PyThreadState *tstate, PyObject *modu
 #endif
         // Initialize the constant values used.
         _initBuiltinModule();
-        createGlobalConstants(tstate);
 
+#if PYTHON_VERSION >= 0x3c0
+        PyObject *real_module_name = PyObject_GetAttrString(module, "__name__");
+        CHECK_OBJECT(real_module_name);
+        module_full_name = strdup(Nuitka_String_AsString(real_module_name));
+#endif
+
+#if PYTHON_VERSION >= 0x3c0
+        createGlobalConstants(tstate, real_module_name);
+#else
+        createGlobalConstants(tstate);
+#endif
         /* Initialize the compiled types of Nuitka. */
         _initCompiledCellType();
         _initCompiledGeneratorType();
@@ -293,6 +310,10 @@ PyObject *modulecode_%(module_identifier)s(PyThreadState *tstate, PyObject *modu
         PRINT_STRING("%(module_identifier)s: Calling setupMetaPathBasedLoader().\n");
 #endif
         setupMetaPathBasedLoader(tstate);
+#if PYTHON_VERSION >= 0x3c0
+        updateMetaPathBasedLoaderModuleRoot(module_full_name);
+#endif
+
 
 #if PYTHON_VERSION >= 0x300
         patchInspectModule(tstate);
@@ -318,8 +339,6 @@ PyObject *modulecode_%(module_identifier)s(PyThreadState *tstate, PyObject *modu
 
     // PRINT_STRING("in init%(module_identifier)s\n");
 
-    moduledict_%(module_identifier)s = MODULE_DICT(module_%(module_identifier)s);
-
 #ifdef _NUITKA_PLUGIN_DILL_ENABLED
     {
         char const *module_name_c;
@@ -404,7 +423,7 @@ PyObject *modulecode_%(module_identifier)s(PyThreadState *tstate, PyObject *modu
         UPDATE_STRING_DICT0(moduledict_%(module_identifier)s, (Nuitka_StringObject *)const_str_plain___builtins__, value);
     }
 
-    UPDATE_STRING_DICT0(moduledict_%(module_identifier)s, (Nuitka_StringObject *)const_str_plain___loader__, (PyObject *)&Nuitka_Loader_Type);
+    UPDATE_STRING_DICT0(moduledict_%(module_identifier)s, (Nuitka_StringObject *)const_str_plain___loader__, Nuitka_Loader_New(loader_entry));
 
 #if PYTHON_VERSION >= 0x340
 // Set the "__spec__" value
@@ -540,9 +559,6 @@ static struct PyModuleDef mdef_%(module_identifier)s = {
 };
 #endif
 
-// Actual name might be different when loaded as a package.
-static char const *module_full_name = %(module_name_cstr)s;
-
 #if PYTHON_VERSION < 0x300
 static void onModuleFileValueRelease(void *v) {
     if (orig_dunder_file_value != NULL) {
@@ -609,11 +625,13 @@ static int %(module_dll_entry_point)s_slot(PyObject *module) {
 #endif
 
 NUITKA_MODULE_INIT_FUNCTION (%(module_dll_entry_point)s)(void) {
+#if PYTHON_VERSION < 0x3c0
     if (_Py_PackageContext != NULL) {
         if (strcmp(module_full_name, _Py_PackageContext) != 0) {
             module_full_name = strdup(_Py_PackageContext);
         }
     }
+#endif
 
 #if PYTHON_VERSION < 0x300
     PyObject *module = Py_InitModule4(

nuitka/code_generation/templates/CodeTemplatesVariables.py

@@ -157,7 +157,7 @@ template_read_mvar_unclear = """\
 """
 
 template_read_locals_dict_with_fallback = """\
-%(to_name)s = DICT_GET_ITEM0(tstate, %(locals_dict)s, %(var_name)s);
+%(to_name)s = %(dict_get_item)s(tstate, %(locals_dict)s, %(var_name)s);
 
 if (%(to_name)s == NULL) {
 %(fallback)s
@@ -169,7 +169,9 @@ template_read_locals_dict_without_fallback = """\
 """
 
 
-template_read_locals_mapping_with_fallback = """\
+# Fallback has no ref, so take one to agree with PyObject_GetItem doing
+# it.
+template_read_locals_mapping_with_fallback_no_ref = """\
 %(to_name)s = PyObject_GetItem(%(locals_dict)s, %(var_name)s);
 
 if (%(to_name)s == NULL) {
@@ -182,6 +184,18 @@ if (%(to_name)s == NULL) {
 }
 """
 
+template_read_locals_mapping_with_fallback_ref = """\
+%(to_name)s = PyObject_GetItem(%(locals_dict)s, %(var_name)s);
+
+if (%(to_name)s == NULL) {
+    if (CHECK_AND_CLEAR_KEY_ERROR_OCCURRED(tstate)) {
+%(fallback)s
+    } else {
+        goto %(exception_exit)s;
+    }
+}
+"""
+
 template_read_locals_mapping_without_fallback = """\
 %(to_name)s = PyObject_GetItem(%(locals_dict)s, %(var_name)s);
 """

nuitka/code_generation/templates_c/CodeTemplateCallsMethodPositional.c.j2

@@ -42,7 +42,7 @@ PyObject *CALL_METHOD_WITH_ARGS{{args_count}}(PyThreadState *tstate, PyObject *s
             if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
                 func = Py_TYPE(descr)->tp_descr_get;
 
-                if (func != NULL && PyDescr_IsData(descr)) {
+                if (func != NULL && Nuitka_Descr_IsData(descr)) {
                     PyObject *called_object = func(descr, source, (PyObject *)type);
                     Py_DECREF(descr);
 
@@ -262,7 +262,7 @@ PyObject *CALL_METHOD_WITH_ARGS{{args_count}}(PyThreadState *tstate, PyObject *s
         if (NuitkaType_HasFeatureClass(Py_TYPE(descr))) {
             func = Py_TYPE(descr)->tp_descr_get;
 
-            if (func != NULL && PyDescr_IsData(descr)) {
+            if (func != NULL && Nuitka_Descr_IsData(descr)) {
                 PyObject *called_object = func(descr, source, (PyObject *)type);
                 Py_DECREF(descr);
 

nuitka/code_generation/templates_c/HelperOperationBinary.c.j2

@@ -15,7 +15,7 @@
 #endif
 
     {% set props = {"exits": {}} %}
-    {{ binary_operation(props, operator, nb_slot, left, right, "type1", "type2", "operand1", "operand2", "exit_binary_result_object", "exit_binary_result_cbool_ok", "exit_binary_result_nbool", "exit_binary_exception") }}
+    {{ binary_operation(props, operator, False, nb_slot, left, right, "type1", "type2", "operand1", "operand2", "exit_binary_result_object", "exit_binary_result_cbool_ok", "exit_binary_result_nbool", "exit_binary_exception") }}
 
 {% if "exit_binary_result_object" in props["exits"] %}
 exit_binary_result_object:

nuitka/code_generation/templates_c/HelperOperationInplace.c.j2

@@ -30,7 +30,7 @@
 {% endif %}
 
     {
-        {{ binary_operation(props, operator, nb_slot, left, right, "type1", "type2", "*operand1", "operand2", "exit_inplace_result_object", "exit_inplace_result_cbool_ok", "exit_inplace_result_nbool", "exit_inplace_exception") }}
+        {{ binary_operation(props, operator, True, nb_slot, left, right, "type1", "type2", "*operand1", "operand2", "exit_inplace_result_object", "exit_inplace_result_cbool_ok", "exit_inplace_result_nbool", "exit_inplace_exception") }}
     }
 
 {% if "exit_inplace_result_object" in props["exits"] %}

nuitka/code_generation/templates_c/HelperSlotsBinary.c.j2

@@ -10,7 +10,7 @@
 {% from 'HelperSlotsTuple.c.j2' import tuple_slot %}
 {% from 'HelperSlotsList.c.j2' import list_slot %}
 {% from 'HelperSlotsSet.c.j2' import set_slot %}
-{% macro operation_unsupported_error_exit(props, operator, left, right, type1, type2, exit_result_exception) %}
+{% macro operation_unsupported_error_exit(props, operator, inplace, left, right, type1, type2, exit_result_exception) %}
 {% set args = [] %}
 {% if left == object_desc %}
 {% do args.append("%s->tp_name" % type1) %}
@@ -24,15 +24,15 @@
 {% set right_name_3 = "'%s'" % ("%s" if right == object_desc else right.getTypeName3()) %}
 {% if (left_name_2 == left_name_3 and right_name_2 == right_name_3) or left.python_requirement or right.python_requirement %}
 {% if left.python_requirement == "PYTHON_VERSION < 0x300" or right.python_requirement == "PYTHON_VERSION < 0x300" %}
-    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator) }}: {{ left_name_2 }} and {{ right_name_2 }}"{{ "," + ",".join(args) if args else "" }});
+    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator, inplace) }}: {{ left_name_2 }} and {{ right_name_2 }}"{{ "," + ",".join(args) if args else "" }});
 {% else %}
-    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator) }}: {{ left_name_3 }} and {{ right_name_3 }}"{{ "," + ",".join(args) if args else "" }});
+    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator, inplace) }}: {{ left_name_3 }} and {{ right_name_3 }}"{{ "," + ",".join(args) if args else "" }});
 {% endif %}
 {% else %}
 #if PYTHON_VERSION < 0x300
-    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator) }}: {{ left_name_2 }} and {{ right_name_2 }}"{{ "," + ",".join(args) if args else "" }});
+    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator, inplace) }}: {{ left_name_2 }} and {{ right_name_2 }}"{{ "," + ",".join(args) if args else "" }});
 #else
-    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator) }}: {{ left_name_3 }} and {{ right_name_3 }}"{{ "," + ",".join(args) if args else "" }});
+    PyErr_Format(PyExc_TypeError, "unsupported operand type(s) for {{ left.getOperationErrorMessageName(operator, inplace) }}: {{ left_name_3 }} and {{ right_name_3 }}"{{ "," + ",".join(args) if args else "" }});
 #endif
 {% endif %}
     {{ goto_exit(props, exit_result_exception) }}
@@ -129,7 +129,7 @@
         }
     }
 {% endmacro %}
-{% macro binary_operation(props, operator, nb_slot, left, right, type1, type2, operand1, operand2, exit_result_object, exit_result_cbool_ok, exit_result_nbool, exit_result_exception) %}
+{% macro binary_operation(props, operator, inplace, nb_slot, left, right, type1, type2, operand1, operand2, exit_result_object, exit_result_cbool_ok, exit_result_nbool, exit_result_exception) %}
 {% set slot1_relevant = left == object_desc or left.hasSlot(nb_slot) %}
 {% set slot2_relevant = right == object_desc or (left != right and right.hasSlot(nb_slot)) %}
 {% set error_needed = 1 %}
@@ -375,7 +375,7 @@
 {% endif %}
 
 {% if error_needed == 1 %}
-    {{ operation_unsupported_error_exit(props, operator, left, right, type1, type2, exit_result_exception) }}
+    {{ operation_unsupported_error_exit(props, operator, inplace, left, right, type1, type2, exit_result_exception) }}
 {% else %}
     NUITKA_CANNOT_GET_HERE("missing error exit annotation");
 {% endif %}

nuitka/freezer/DependsExe.py

@@ -44,6 +44,7 @@ def getDependsExePath():
         url=depends_url,
         is_arch_specific=getArchitecture(),
         binary="depends.exe",
+        unzip=True,
         flatten=True,
         specificity="",  # Note: If there ever was an update, put version here.
         message="""\
@@ -213,7 +214,8 @@ SxS
 
     if not os.path.exists(output_filename):
         inclusion_logger.sysexit(
-            "Error, 'depends.exe' failed to produce expected output."
+            "Error, 'depends.exe' failed to produce expected output for binary '%s'."
+            % binary_filename
         )
 
     # Opening the result under lock, so it is not getting locked by new processes.

nuitka/freezer/DllDependenciesMacOS.py

@@ -25,6 +25,7 @@ from nuitka.utils.SharedLibraries import (
     callInstallNameTool,
     getOtoolDependencyOutput,
     getOtoolListing,
+    parseOtoolListingOutput,
 )
 from nuitka.utils.Utils import getArchitecture
 
@@ -109,17 +110,9 @@ def detectBinaryPathDLLsMacOS(
 
 
 def _parseOtoolListingOutput(output):
-    paths = OrderedSet()
-
-    for line in output.split(b"\n")[1:]:
-        if str is not bytes:
-            line = line.decode("utf8")
-
-        if not line:
-            continue
-
-        filename = line.split(" (", 1)[0].strip()
+    result = OrderedSet()
 
+    for filename in parseOtoolListingOutput(output):
         # Ignore dependency from system paths.
         if not isFilenameBelowPath(
             path=(
@@ -129,9 +122,9 @@ def _parseOtoolListingOutput(output):
             ),
             filename=filename,
         ):
-            paths.add(filename)
+            result.add(filename)
 
-    return paths
+    return result
 
 
 def _getNonVersionedDllFilenames2(filename):

nuitka/freezer/IncludedDataFiles.py

@@ -26,7 +26,7 @@ from nuitka.Options import (
     shallMakeModule,
 )
 from nuitka.OutputDirectories import getStandaloneDirectoryPath
-from nuitka.Tracing import options_logger
+from nuitka.Tracing import general, options_logger
 from nuitka.utils.FileOperations import (
     areSamePaths,
     containsPathElements,
@@ -36,6 +36,7 @@ from nuitka.utils.FileOperations import (
     getFilenameExtension,
     getFileSize,
     isFilenameBelowPath,
+    isLegalPath,
     isRelativePath,
     makePath,
     openTextFile,
@@ -98,6 +99,14 @@ class IncludedDataFile(object):
         self.kind = kind
         self.source_path = source_path
         self.dest_path = os.path.normpath(dest_path)
+
+        is_legal, illegal_reason = isLegalPath(dest_path)
+        if not is_legal:
+            general.sysexit(
+                "Error, cannot add data file with '%s' path, as '%s'"
+                % (dest_path, illegal_reason)
+            )
+
         self.reason = reason
         self.data = data
         self.tags = tags_set
@@ -159,8 +168,8 @@ def makeIncludedDataFile(source_path, dest_path, reason, tracer, tags):
     if isAcceleratedMode():
         if "package_data" not in tags and not areSamePaths(source_path, dest_path):
             tracer.sysexit(
-                "Error, cannot change paths for data files in accelerated mode '%s'."
-                % dest_path
+                "Error, cannot change paths for data files in accelerated mode from '%s' to '%s'."
+                % (source_path, dest_path)
             )
     else:
         inside = True
@@ -347,6 +356,8 @@ def _addIncludedDataFilesFromFileOptions():
             else:
                 rel_path = os.path.join(dest_path, relpath(filename, source_path))
 
+            rel_path = os.path.normpath(rel_path)
+
             if containsPathElements(rel_path, default_ignored_dirs):
                 continue
 
@@ -369,7 +380,7 @@ def _addIncludedDataFilesFromFileOptions():
 
         for included_datafile in makeIncludedDataDirectory(
             source_path=source_path,
-            dest_path=dest_path,
+            dest_path=os.path.normpath(dest_path),
             reason="specified data dir '%s' on command line" % source_path,
             tracer=options_logger,
             tags="user",

nuitka/freezer/IncludedEntryPoints.py

@@ -315,12 +315,18 @@ def setMainEntryPoint(binary_filename):
 
 
 def addExtensionModuleEntryPoint(module):
+    dest_path = module.getFullName().asPath()
+
+    if module.isExtensionModulePackage():
+        dest_path = os.path.join(dest_path, "__init__")
+
+    dest_path += getSharedLibrarySuffix(preferred=False)
+
     standalone_entry_points.append(
         makeExtensionModuleEntryPoint(
             logger=general,
             source_path=module.getFilename(),
-            dest_path=module.getFullName().asPath()
-            + getSharedLibrarySuffix(preferred=False),
+            dest_path=dest_path,
             module_name=module.getFullName(),
             package_name=module.getFullName().getPackageName(),
             reason=(

nuitka/freezer/Onefile.py

@@ -270,7 +270,12 @@ def packDistFolderToOnefileBootstrap(onefile_output_filename, dist_dir):
     if Options.isRemoveBuildDir():
         onefile_logger.info("Removing onefile build directory '%s'." % source_dir)
 
-        removeDirectory(path=source_dir, ignore_errors=False)
+        removeDirectory(
+            path=source_dir,
+            logger=onefile_logger,
+            ignore_errors=False,
+            extra_recommendation=None,
+        )
         assert not os.path.exists(source_dir)
     else:
         onefile_logger.info("Keeping onefile build directory '%s'." % source_dir)

nuitka/freezer/Standalone.py

@@ -28,7 +28,11 @@ from nuitka.Progress import (
     reportProgressBar,
     setupProgressBar,
 )
-from nuitka.PythonFlavors import isAnacondaPython, isHomebrewPython
+from nuitka.PythonFlavors import (
+    getHomebrewInstallPath,
+    isAnacondaPython,
+    isHomebrewPython,
+)
 from nuitka.PythonVersions import getSystemPrefixPath
 from nuitka.Tracing import general, inclusion_logger
 from nuitka.utils.FileOperations import areInSamePaths, isFilenameBelowPath
@@ -226,9 +230,12 @@ def copyDllsUsed(dist_dir, standalone_entry_points):
 def _reduceToPythonPath(used_dlls):
     inside_paths = getPythonUnpackedSearchPath()
 
-    if isAnacondaPython() or isHomebrewPython():
+    if isAnacondaPython():
         inside_paths.insert(0, getSystemPrefixPath())
 
+    if isHomebrewPython():
+        inside_paths.insert(0, getHomebrewInstallPath())
+
     def decideInside(dll_filename):
         return any(
             isFilenameBelowPath(path=inside_path, filename=dll_filename)

nuitka/importing/Importing.py

@@ -49,7 +49,11 @@ from nuitka.utils.ModuleNames import ModuleName
 from nuitka.utils.SharedLibraries import (
     hasUniversalOrMatchingMacOSArchitecture,
 )
-from nuitka.utils.Utils import isMacOS, isWin32OrPosixWindows
+from nuitka.utils.Utils import (
+    getLaunchingNuitkaProcessEnvironmentValue,
+    isMacOS,
+    isWin32OrPosixWindows,
+)
 
 from .IgnoreListing import isIgnoreListedNotExistingModule
 from .PreloadedPackages import getPreloadedPackagePath, isPreloadedPackagePath
@@ -185,7 +189,7 @@ def hasMainScriptDirectory():
 def isPackageDir(dirname):
     """Decide if a directory is a package.
 
-    Before Python3.3 it's required to have a "__init__.py" file, but then
+    Before Python3 it's required to have a "__init__.py" file, but then
     it became impossible to decide, and for extra fun, there is also the
     extra packages provided via "*.pth" file tricks by "site.py" loading.
     """
@@ -340,7 +344,7 @@ def findModule(module_name, parent_package, level):
         # TODO: Should give a warning and return not found if the levels
         # exceed the package name.
         if parent_package is not None:
-            parent_package = parent_package.getRelativePackageName(level)
+            parent_package = parent_package.getRelativePackageName(level - 1)
         else:
             return None, None, None, "not-found"
 
@@ -642,7 +646,12 @@ def _unpackPathElement(path_entry):
                         zip_ref.extractall(target_dir)
                         zip_ref.close()
                     except BaseException:
-                        removeDirectory(target_dir, ignore_errors=True)
+                        removeDirectory(
+                            target_dir,
+                            logger=recursion_logger,
+                            ignore_errors=True,
+                            extra_recommendation=None,
+                        )
                         raise
 
                 _egg_files[path_entry] = target_dir
@@ -719,7 +728,7 @@ def _findModuleInPath(module_name):
     # executed, while we normally search in PYTHONPATH after it was executed,
     # and on some systems, that fails.
     if package_name is None and module_name == "site":
-        candidate = os.getenv("NUITKA_SITE_FILENAME")
+        candidate = getLaunchingNuitkaProcessEnvironmentValue("NUITKA_SITE_FILENAME")
 
         if candidate:
             return candidate, "py"

nuitka/importing/Recursion.py

@@ -154,6 +154,9 @@ def _decideRecursion(
     if module_name == "__main__":
         return False, "Main program is not followed to a second time."
 
+    if using_module_name == "__main__" and Options.isMultidistMode():
+        return True, "Main program multidist entry points."
+
     if module_kind == "extension" and not Options.isStandaloneMode():
         return False, "Extension modules cannot be inspected."
 

nuitka/nodes/AttributeNodesGenerated.py

@@ -10,18 +10,18 @@
 
 WARNING, this code is GENERATED. Modify the template AttributeNodeFixed.py.j2 instead!
 
-spell-checker: ignore __prepare__ append args autograph buffering capitalize casefold
-spell-checker: ignore center chars clear closefd copy count decode default delete dist
-spell-checker: ignore distribution_name encode encoding end endswith errors exit_code
-spell-checker: ignore expandtabs experimental_attributes experimental_autograph_options
+spell-checker: ignore __prepare__ append args autograph capitalize casefold center chars
+spell-checker: ignore clear copy count decode default delete dist distribution_name encode
+spell-checker: ignore encoding end endswith errors exit_code expandtabs
+spell-checker: ignore experimental_attributes experimental_autograph_options
 spell-checker: ignore experimental_compile experimental_follow_type_hints
-spell-checker: ignore experimental_implements experimental_relax_shapes extend file
-spell-checker: ignore fillchar find format format_map formatmap fromkeys func get group
-spell-checker: ignore handle has_key haskey index input_signature insert isalnum isalpha
-spell-checker: ignore isascii isdecimal isdigit isidentifier islower isnumeric isprintable
-spell-checker: ignore isspace istitle isupper item items iterable iteritems iterkeys
-spell-checker: ignore itervalues jit_compile join keepends key keys kwargs ljust lower
-spell-checker: ignore lstrip maketrans maxsplit mode name new newline old opener p package
+spell-checker: ignore experimental_implements experimental_relax_shapes extend fillchar
+spell-checker: ignore find format format_map formatmap fromkeys func get group handle
+spell-checker: ignore has_key haskey index input_signature insert isalnum isalpha isascii
+spell-checker: ignore isdecimal isdigit isidentifier islower isnumeric isprintable isspace
+spell-checker: ignore istitle isupper item items iterable iteritems iterkeys itervalues
+spell-checker: ignore jit_compile join keepends key keys kwargs ljust lower lstrip
+spell-checker: ignore maketrans maxsplit mode name new old p package
 spell-checker: ignore package_or_requirement pairs partition path pop popitem prefix
 spell-checker: ignore prepare reduce_retracing remove replace resource resource_name
 spell-checker: ignore reverse rfind rindex rjust rpartition rsplit rstrip s sep setdefault
@@ -32,6 +32,7 @@ spell-checker: ignore winmode zfill
 """
 
 
+from nuitka.PythonVersions import getDictFromkeysNoArgErrorMessage
 from nuitka.specs.BuiltinBytesOperationSpecs import (
     bytes_capitalize_spec,
     bytes_center_spec,
@@ -260,7 +261,10 @@ from .ListOperationNodes import (
     ExpressionListOperationReverse,
 )
 from .NodeBases import SideEffectsFromChildrenMixin
-from .NodeMakingHelpers import wrapExpressionWithNodeSideEffects
+from .NodeMakingHelpers import (
+    makeRaiseExceptionReplacementExpression,
+    wrapExpressionWithNodeSideEffects,
+)
 from .StrNodes import (
     ExpressionStrOperationCapitalize,
     ExpressionStrOperationCenter2,
@@ -2857,6 +2861,11 @@ class ExpressionAttributeLookupDictFromkeys(
             node=call_node,
             builtin_class=wrapExpressionDictOperationFromkeys,
             builtin_spec=dict_fromkeys_spec,
+            empty_special_class=lambda source_ref: makeRaiseExceptionReplacementExpression(
+                expression=dict_arg,
+                exception_type="TypeError",
+                exception_value=getDictFromkeysNoArgErrorMessage(),
+            ),
         )
 
         result = wrapExpressionWithNodeSideEffects(old_node=dict_arg, new_node=result)

nuitka/nodes/BuiltinOpenNodes.py

@@ -7,6 +7,7 @@ This is a rather two sided beast, as it may be read or write. And we would like
 to track it, so we can include files into the executable, or write more efficiently.
 """
 
+from .BuiltinRefNodes import ExpressionBuiltinPatchableTypeRef
 from .ChildrenHavingMixins import (
     ChildrenExpressionBuiltinOpenP2Mixin,
     ChildrenExpressionBuiltinOpenP3Mixin,
@@ -127,6 +128,10 @@ def makeExpressionBuiltinsOpenCall(
     )
 
 
+def makeBuiltinOpenRefNode(source_ref):
+    return ExpressionBuiltinPatchableTypeRef(builtin_name="open", source_ref=source_ref)
+
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #