Nuitka-winsvc 2.4.1__tar.gz → 2.4.7__tar.gz

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/Nuitka_winsvc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Nuitka-winsvc
-Version: 2.4.1
+Version: 2.4.7
 Summary: Nuitka but support compile as Windows service
 Home-page: https://github.com/tabris17/Nuitka-winsvc
 Author: tabris17

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Nuitka-winsvc
-Version: 2.4.1
+Version: 2.4.7
 Summary: Nuitka but support compile as Windows service
 Home-page: https://github.com/tabris17/Nuitka-winsvc
 Author: tabris17

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/HardImportRegistry.py

@@ -120,6 +120,7 @@ hard_modules_trust_with_side_effects = set(
     [
         "site",
         "tensorflow",
+        "importlib_metadata",
         # TODO: Disabled for now, keyword only arguments and star list argument are
         # having ordering issues for call matching and code generation.
         # "networkx.utils.decorators"

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/Options.py

@@ -1705,7 +1705,7 @@ def getJobLimit():
         result = int(jobs)
 
         if result <= 0:
-            result = max(1, getCPUCoreCount() + jobs)
+            result = max(1, getCPUCoreCount() + result)
 
     return result
 

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/Progress.py

@@ -83,7 +83,8 @@ class NuitkaProgressBar(object):
 
     @contextmanager
     def withExternalWritingPause(self):
-        with self.tqdm.external_write_mode():
+        # spell-checker: ignore nolock
+        with self.tqdm.external_write_mode(nolock=True):
             yield
 
 

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/Tracing.py

@@ -20,6 +20,7 @@ import sys
 import textwrap
 import traceback
 
+from nuitka.__past__ import BrokenPipeError  # pylint: disable=redefined-builtin
 from nuitka.utils.Utils import isWin32Windows
 
 # Written by Options module.

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V2.4.1
+Nuitka V2.4.7
 Copyright (C) 2024 Kay Hayen."""
 
 

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/__past__.py

@@ -168,6 +168,11 @@ try:
 except NameError:
     BaseExceptionGroup = None
 
+try:
+    BrokenPipeError = BrokenPipeError  # pylint: disable=I0021,redefined-builtin
+except NameError:
+    BrokenPipeError = OSError
+
 try:
     _md5()
 except ValueError:

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/build/include/nuitka/helpers.h

@@ -162,7 +162,7 @@ extern PyObject *BUILTIN_OPEN(PyThreadState *tstate, PyObject *file_name, PyObje
 // Small helper to open files with few arguments in C.
 extern PyObject *BUILTIN_OPEN_BINARY_READ_SIMPLE(PyThreadState *tstate, PyObject *filename);
 extern PyObject *BUILTIN_OPEN_SIMPLE(PyThreadState *tstate, PyObject *filename, char const *mode, bool buffering,
-                                     PyObject *encoding, bool close_fd);
+                                     PyObject *encoding);
 
 // Small helper to read file contents with few arguments in C.
 extern PyObject *GET_FILE_BYTES(PyThreadState *tstate, PyObject *filename);
@@ -294,7 +294,11 @@ extern PyObject *BUILTIN_LONG2(PyThreadState *tstate, PyObject *value, PyObject
 // For the constant loading:
 
 // Call this to initialize all common constants pre-main.
+#if defined(_NUITKA_MODULE) && PYTHON_VERSION >= 0x3c0
+extern void createGlobalConstants(PyThreadState *tstate, PyObject *real_module_name);
+#else
 extern void createGlobalConstants(PyThreadState *tstate);
+#endif
 
 // Call this to check of common constants are still intact.
 #ifndef __NUITKA_NO_ASSERT__

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/build/include/nuitka/prelude.h

@@ -459,11 +459,6 @@ static inline PyObject *_Py_XNewRef(PyObject *obj) {
 #define NuitkaType_HasFeatureClass(descr) (1)
 #endif
 
-// For newer Python, this API was moved to global state
-#if PYTHON_VERSION >= 0x3c0
-#define _Py_PackageContext (_PyRuntime.imports.pkgcontext)
-#endif
-
 // Our replacement for "PyType_IsSubtype"
 extern bool Nuitka_Type_IsSubtype(PyTypeObject *a, PyTypeObject *b);
 

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/build/include/nuitka/unfreezing.h

@@ -58,6 +58,12 @@ struct Nuitka_MetaPathBasedLoaderEntry {
 extern void registerMetaPathBasedLoader(struct Nuitka_MetaPathBasedLoaderEntry *loader_entries,
                                         unsigned char **bytecode_data);
 
+// For module mode, embedded modules may have to be shifted to below the
+// namespace they are loaded into.
+#ifdef _NUITKA_MODULE
+extern void updateMetaPathBasedLoaderModuleRoot(char const *module_root_name);
+#endif
+
 /* Create a loader object responsible for a package. */
 extern PyObject *Nuitka_Loader_New(struct Nuitka_MetaPathBasedLoaderEntry const *entry);
 

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/build/static_src/CompiledGeneratorType.c

@@ -561,7 +561,7 @@ static PyObject *_Nuitka_Generator_send(PyThreadState *tstate, struct Nuitka_Gen
         }
 
 #if _DEBUG_GENERATOR
-        PRINT_GENERATOR_STATUS("Switching to coroutine", generator);
+        PRINT_GENERATOR_STATUS("Switching to generator", generator);
         PRINT_COROUTINE_VALUE("value", value);
         PRINT_CURRENT_EXCEPTION();
         PRINT_NEW_LINE();

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/build/static_src/HelpersDictionariesGenerated.c

@@ -184,7 +184,7 @@ PyObject *DICT_COPY(PyThreadState *tstate, PyObject *dict_value) {
 #if PYTHON_VERSION >= 0x3b0
             // Need to preserve values prefix.
             size_t prefix_size = ((uint8_t *)new_values)[-1];
-            memcpy(((char *)new_values) - prefix_size, ((char *)dict_mp->ma_values) - prefix_size, prefix_size - 1);
+            memcpy((char *)new_values - prefix_size, (char *)dict_mp->ma_values - prefix_size, prefix_size - 1);
 #endif
 
             result_mp->ma_values = new_values;
@@ -400,7 +400,7 @@ PyObject *DEEP_COPY_DICT(PyThreadState *tstate, PyObject *dict_value) {
 #if PYTHON_VERSION >= 0x3b0
             // Need to preserve values prefix.
             size_t prefix_size = ((uint8_t *)new_values)[-1];
-            memcpy(((char *)new_values) - prefix_size, ((char *)dict_mp->ma_values) - prefix_size, prefix_size - 1);
+            memcpy((char *)new_values - prefix_size, (char *)dict_mp->ma_values - prefix_size, prefix_size - 1);
 #endif
 
             result_mp->ma_values = new_values;
@@ -651,7 +651,7 @@ static PyObject *COPY_DICT_KW(PyThreadState *tstate, PyObject *dict_value) {
 #if PYTHON_VERSION >= 0x3b0
             // Need to preserve values prefix.
             size_t prefix_size = ((uint8_t *)new_values)[-1];
-            memcpy(((char *)new_values) - prefix_size, ((char *)dict_mp->ma_values) - prefix_size, prefix_size - 1);
+            memcpy((char *)new_values - prefix_size, (char *)dict_mp->ma_values - prefix_size, prefix_size - 1);
 #endif
 
             result_mp->ma_values = new_values;

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/build/static_src/HelpersFiles.c

@@ -10,7 +10,7 @@
 
 // Small helper to open files with few arguments.
 PyObject *BUILTIN_OPEN_SIMPLE(PyThreadState *tstate, PyObject *filename, char const *mode, bool buffering,
-                              PyObject *encoding, bool close_fd) {
+                              PyObject *encoding) {
     PyObject *mode_obj = Nuitka_String_FromString(mode);
     PyObject *buffering_obj = buffering ? const_int_pos_1 : const_int_0;
 
@@ -38,7 +38,7 @@ PyObject *BUILTIN_OPEN_SIMPLE(PyThreadState *tstate, PyObject *filename, char co
         PyObject *mode_obj2 = PyUnicode_FromString("wb");
 
         PyObject *binary_stream =
-            BUILTIN_OPEN(tstate, filename, mode_obj2, buffering_obj, NULL, NULL, NULL, BOOL_FROM(close_fd), NULL);
+            BUILTIN_OPEN(tstate, filename, mode_obj2, buffering_obj, NULL, NULL, NULL, NULL, NULL);
 
         Py_DECREF(mode_obj2);
 

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/build/static_src/InspectPatcher.c

@@ -258,8 +258,20 @@ class GeneratorWrapperEnhanced(_old_GeneratorWrapper):\n\
             if gen.gi_code.co_flags & 0x0020:\n\
                 self._GeneratorWrapper__isgen = True\n\
 \n\
-types._GeneratorWrapper = GeneratorWrapperEnhanced\
-";
+types._GeneratorWrapper = GeneratorWrapperEnhanced\n"
+#if PYTHON_VERSION >= 0x3b0
+                                                  "\
+import inspect\n\
+_old_get_code_position = inspect._get_code_position\n\
+def _get_code_position(code, instruction_index):\n\
+    try:\n\
+        return _old_get_code_position(code, instruction_index)\n\
+    except StopIteration:\n\
+        return None, None, None, None\n\
+inspect._get_code_position=_get_code_position\n\
+"
+#endif
+        ;
 
     PyObject *wrapper_enhancement_code_object = Py_CompileString(wrapper_enhancement_code, "<exec>", Py_file_input);
     CHECK_OBJECT(wrapper_enhancement_code_object);

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/build/static_src/MainProgram.c

@@ -850,7 +850,7 @@ static void setInputOutputHandles(PyThreadState *tstate) {
 #else
         PyObject *filename = getExpandedTemplatePath(NUITKA_FORCED_STDOUT_PATH);
 #endif
-        PyObject *stdout_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "w", SYSFLAG_UNBUFFERED != 1, encoding, false);
+        PyObject *stdout_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "w", SYSFLAG_UNBUFFERED != 1, encoding);
         if (unlikely(stdout_file == NULL)) {
             PyErr_PrintEx(1);
             Py_Exit(1);
@@ -867,7 +867,7 @@ static void setInputOutputHandles(PyThreadState *tstate) {
 #else
         PyObject *filename = getExpandedTemplatePath(NUITKA_FORCED_STDERR_PATH);
 #endif
-        PyObject *stderr_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "w", false, encoding, false);
+        PyObject *stderr_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "w", false, encoding);
         if (unlikely(stderr_file == NULL)) {
             PyErr_PrintEx(1);
             Py_Exit(1);
@@ -888,19 +888,19 @@ static void setInputOutputHandles(PyThreadState *tstate) {
         if (shallSetOutputHandleToNull("stdin")) {
             // CPython core requires stdin to be buffered due to methods usage, and it won't matter
             // here much.
-            PyObject *stdin_file = BUILTIN_OPEN_SIMPLE(tstate, devnull_filename, "r", true, encoding, false);
+            PyObject *stdin_file = BUILTIN_OPEN_SIMPLE(tstate, devnull_filename, "r", true, encoding);
 
             setStdinHandle(tstate, stdin_file);
         }
 
         if (shallSetOutputHandleToNull("stdout")) {
-            PyObject *stdout_file = BUILTIN_OPEN_SIMPLE(tstate, devnull_filename, "w", false, encoding, false);
+            PyObject *stdout_file = BUILTIN_OPEN_SIMPLE(tstate, devnull_filename, "w", false, encoding);
 
             setStdoutHandle(tstate, stdout_file);
         }
 
         if (shallSetOutputHandleToNull("stderr")) {
-            PyObject *stderr_file = BUILTIN_OPEN_SIMPLE(tstate, devnull_filename, "w", false, encoding, false);
+            PyObject *stderr_file = BUILTIN_OPEN_SIMPLE(tstate, devnull_filename, "w", false, encoding);
 
             setStderrHandle(tstate, stderr_file);
         }
@@ -1470,7 +1470,7 @@ orig_argv = argv;
         // platform ones in the future.
         PyObject *encoding = NULL;
 
-        PyObject *stdout_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "w", SYSFLAG_UNBUFFERED != 1, encoding, false);
+        PyObject *stdout_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "w", SYSFLAG_UNBUFFERED != 1, encoding);
         if (unlikely(stdout_file == NULL)) {
             PyErr_PrintEx(1);
             Py_Exit(1);
@@ -1487,7 +1487,7 @@ orig_argv = argv;
         // platform ones in the future.
         PyObject *encoding = NULL;
 
-        PyObject *stderr_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "w", SYSFLAG_UNBUFFERED != 1, encoding, false);
+        PyObject *stderr_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "w", SYSFLAG_UNBUFFERED != 1, encoding);
         if (unlikely(stderr_file == NULL)) {
             PyErr_PrintEx(1);
             Py_Exit(1);
@@ -1506,7 +1506,7 @@ orig_argv = argv;
 
         // CPython core requires stdin to be buffered due to methods usage, and it won't matter
         // here much.
-        PyObject *stdin_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "r", true, encoding, false);
+        PyObject *stdin_file = BUILTIN_OPEN_SIMPLE(tstate, filename, "r", true, encoding);
 
         Py_DECREF(filename);
 

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/build/static_src/MetaPathBasedLoader.c

@@ -1962,6 +1962,42 @@ PyObject *Nuitka_Loader_New(struct Nuitka_MetaPathBasedLoaderEntry const *entry)
     return (PyObject *)result;
 }
 
+#ifdef _NUITKA_MODULE
+void updateMetaPathBasedLoaderModuleRoot(char const *module_root_name) {
+    assert(module_root_name != NULL);
+    char const *last_dot = strrchr(module_root_name, '.');
+
+    if (last_dot != NULL) {
+        struct Nuitka_MetaPathBasedLoaderEntry *current = loader_entries;
+        assert(current);
+
+        while (current->name != NULL) {
+            if ((current->flags & NUITKA_TRANSLATED_FLAG) != 0) {
+                current->name = UN_TRANSLATE(current->name);
+                current->flags -= NUITKA_TRANSLATED_FLAG;
+            }
+
+            char name[2048];
+
+            if (strcmp(last_dot + 1, current->name) == 0) {
+                copyStringSafeN(name, module_root_name, last_dot - module_root_name + 1, sizeof(name));
+                appendStringSafe(name, current->name, sizeof(name));
+
+                current->name = strdup(name);
+            } else if (strncmp(last_dot + 1, current->name, strlen(last_dot + 1)) == 0 &&
+                       current->name[strlen(last_dot + 1)] == '.') {
+                copyStringSafeN(name, module_root_name, last_dot - module_root_name + 1, sizeof(name));
+                appendStringSafe(name, current->name, sizeof(name));
+
+                current->name = strdup(name);
+            }
+
+            current++;
+        }
+    }
+}
+#endif
+
 void registerMetaPathBasedLoader(struct Nuitka_MetaPathBasedLoaderEntry *_loader_entries,
                                  unsigned char **bytecode_data) {
     // Do it only once.
@@ -1977,43 +2013,14 @@ void registerMetaPathBasedLoader(struct Nuitka_MetaPathBasedLoaderEntry *_loader
         PySys_WriteStderr("Setup nuitka compiled module/bytecode/extension importer.\n");
     }
 
-#ifdef _NUITKA_MODULE
-    if (_Py_PackageContext != NULL) {
-        char const *last_dot = strrchr(_Py_PackageContext, '.');
-
-        if (last_dot != NULL) {
-            struct Nuitka_MetaPathBasedLoaderEntry *current = _loader_entries;
-            assert(current);
-
-            while (current->name != NULL) {
-                if ((current->flags & NUITKA_TRANSLATED_FLAG) != 0) {
-                    current->name = UN_TRANSLATE(current->name);
-                    current->flags -= NUITKA_TRANSLATED_FLAG;
-                }
-
-                char name[2048];
-
-                if (strcmp(last_dot + 1, current->name) == 0) {
-                    copyStringSafeN(name, _Py_PackageContext, last_dot - _Py_PackageContext + 1, sizeof(name));
-                    appendStringSafe(name, current->name, sizeof(name));
-
-                    current->name = strdup(name);
-                } else if (strncmp(last_dot + 1, current->name, strlen(last_dot + 1)) == 0 &&
-                           current->name[strlen(last_dot + 1)] == '.') {
-                    copyStringSafeN(name, _Py_PackageContext, last_dot - _Py_PackageContext + 1, sizeof(name));
-                    appendStringSafe(name, current->name, sizeof(name));
-
-                    current->name = strdup(name);
-                }
+    loader_entries = _loader_entries;
 
-                current++;
-            }
-        }
+#if defined(_NUITKA_MODULE) && PYTHON_VERSION < 0x3c0
+    if (_Py_PackageContext != NULL) {
+        updateMetaPathBasedLoaderModuleRoot(_Py_PackageContext);
     }
 #endif
 
-    loader_entries = _loader_entries;
-
     Nuitka_PyType_Ready(&Nuitka_Loader_Type, NULL, true, false, false, false, false);
 
 #ifdef _NUITKA_EXE

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/build/static_src/MetaPathBasedLoaderResourceReaderFiles.c

@@ -186,7 +186,7 @@ static PyObject *Nuitka_ResourceReaderFiles_read_text(struct Nuitka_ResourceRead
         return NULL;
     }
 
-    PyObject *file_object = BUILTIN_OPEN_SIMPLE(tstate, file_name, "r", true, encoding, true);
+    PyObject *file_object = BUILTIN_OPEN_SIMPLE(tstate, file_name, "r", true, encoding);
 
     Py_DECREF(file_name);
 

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/build/static_src/OnefileBootstrap.c

@@ -814,20 +814,86 @@ extern bool checkSplashScreen(void);
 #endif
 
 #ifdef _WIN32
+
+static bool containsWStringAny(wchar_t const *source, wchar_t const *characters) {
+    while (*characters) {
+        if (wcschr(source, *characters) != NULL) {
+            return true;
+        }
+
+        characters++;
+    }
+
+    return false;
+}
+
 static wchar_t *getCommandLineForChildProcess(void) {
+
+    wchar_t *orig_command_line = GetCommandLineW();
+#if defined(_NUITKA_EXPERIMENTAL_DEBUG_ONEFILE_HANDLING)
+    wprintf(L"Command line was '%ls'\n", orig_command_line);
+#endif
+
     int argc;
-    LPWSTR *argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+    LPWSTR *argv = CommandLineToArgvW(orig_command_line, &argc);
     assert(argv != NULL);
     assert(argc > 0);
 
     static wchar_t result[32768];
     result[0] = 0;
 
-    appendWStringSafeW(result, getBinaryPath(), sizeof(result) / sizeof(wchar_t));
+    argv[0] = getBinaryPath();
+
+    for (int i = 0; i < argc; i++) {
+        if (i >= 1) {
+            appendWCharSafeW(result, L' ', sizeof(result) / sizeof(wchar_t));
+        }
+
+        bool needs_quote = containsWStringAny(argv[i], L" \t\n\v\"");
 
-    for (int i = 1; i < argc; i++) {
-        appendWCharSafeW(result, L' ', sizeof(result) / sizeof(wchar_t));
-        appendWStringSafeW(result, argv[i], sizeof(result) / sizeof(wchar_t));
+#if defined(_NUITKA_EXPERIMENTAL_DEBUG_ONEFILE_HANDLING)
+        wprintf(L"Command line arg %d was '%ls' needs quoting %ls\n", i, argv[i], needs_quote ? L"yes" : L"no");
+#endif
+
+        if (needs_quote) {
+            appendWCharSafeW(result, L'"', sizeof(result) / sizeof(wchar_t));
+
+            wchar_t const *current = argv[i];
+
+            for (;;) {
+                int backslash_count = 0;
+
+                while (*current == L'\\') {
+                    current++;
+                    backslash_count += 1;
+                }
+
+                if (*current == 0) {
+                    for (int j = 0; j < backslash_count * 2; j++) {
+                        appendWCharSafeW(result, L'\\', sizeof(result) / sizeof(wchar_t));
+                    }
+
+                    break;
+                } else if (*current == L'"') {
+                    for (int j = 0; j < backslash_count * 2 + 1; j++) {
+                        appendWCharSafeW(result, L'\\', sizeof(result) / sizeof(wchar_t));
+                    }
+                } else {
+                    for (int j = 0; j < backslash_count; j++) {
+                        appendWCharSafeW(result, L'\\', sizeof(result) / sizeof(wchar_t));
+                    }
+                }
+
+                appendWCharSafeW(result, *current, sizeof(result) / sizeof(wchar_t));
+
+                current++;
+            }
+
+            appendWCharSafeW(result, L'"', sizeof(result) / sizeof(wchar_t));
+
+        } else {
+            appendWStringSafeW(result, argv[i], sizeof(result) / sizeof(wchar_t));
+        }
     }
 
 #if defined(_NUITKA_EXPERIMENTAL_DEBUG_ONEFILE_HANDLING)

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/code_generation/Emission.py

@@ -50,7 +50,7 @@ def withSubCollector(emit, context):
             for local_declaration in local_declarations:
                 emit(indented(local_declaration))
 
-            sub_emit.emitTo(emit, level=1)
+            sub_emit.emitTo(emit, level=4)
 
             emit("}")
         else:

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/code_generation/Indentation.py

@@ -14,7 +14,7 @@ def _indentedCode(codes, prefix):
     )
 
 
-def indented(codes, level=1, vert_block=False):
+def indented(codes, level=4, vert_block=False):
     if type(codes) is str:
         codes = codes.split("\n")
 

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/code_generation/ModuleCodes.py

@@ -152,7 +152,7 @@ def getModuleCode(
         "module_codes": indented(module_codes.codes),
         "module_exit": module_exit,
         "module_code_objects_decl": indented(module_code_objects_decl, 0),
-        "module_code_objects_init": indented(module_code_objects_init, 1),
+        "module_code_objects_init": indented(module_code_objects_init),
         "constants_count": context.getConstantsCount(),
         "module_const_blob_name": module_const_blob_name,
         "module_dll_entry_point": module_dll_entry_point,

{nuitka_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/code_generation/templates/CodeTemplatesConstants.py

@@ -62,7 +62,11 @@ extern void setDistributionsMetadata(PyThreadState *tstate, PyObject *metadata_i
 // 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");
 
@@ -216,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
@@ -244,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);
@@ -256,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_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/code_generation/templates/CodeTemplatesModules.py

@@ -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;
@@ -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_winsvc-2.4.1 → nuitka_winsvc-2.4.7}/nuitka/code_generation/templates_c/HelperDictionaryCopy.c.j2

@@ -72,7 +72,7 @@ else
 #if PYTHON_VERSION >= 0x3b0
         // Need to preserve values prefix.
         size_t prefix_size = ((uint8_t *)new_values)[-1];
-        memcpy(((char *)new_values)-prefix_size, ((char *)dict_mp->ma_values)-prefix_size, prefix_size-1);
+        memcpy((char *)new_values - prefix_size, (char *)dict_mp->ma_values - prefix_size, prefix_size-1);
 #endif
 
         result_mp->ma_values = new_values;