Nuitka-winsvc 1.9.3__tar.gz → 1.9.6__tar.gz

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/Nuitka_winsvc.egg-info/PKG-INFO

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

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/Nuitka_winsvc.egg-info/SOURCES.txt

@@ -1152,6 +1152,8 @@ nuitka/plugins/standard/__init__.py
 nuitka/plugins/standard/standard.nuitka-package.config.yml
 nuitka/plugins/standard/stdlib2.nuitka-package.config.yml
 nuitka/plugins/standard/stdlib3.nuitka-package.config.yml
+nuitka/plugins/standard/DillPlugin/DillPlugin.c
+nuitka/plugins/standard/DillPlugin/dill-postLoad.py
 nuitka/reports/CompilationReportReader.py
 nuitka/reports/LicenseReport.rst.j2
 nuitka/reports/Reports.py

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/PKG-INFO

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

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/README.rst

@@ -12,8 +12,8 @@ license, requirements, credits, etc.
 
 Nuitka is **the** Python compiler. It is written in Python. It is a
 seamless replacement or extension to the Python interpreter and compiles
-**every** construct that CPython 2.6, 2.7, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8,
-3.9, 3.10, 3.11 have, when itself run with that Python version.
+**every** construct that CPython 2.6, 2.7, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9,
+3.10, 3.11 have, when itself run with that Python version.
 
 It then executes uncompiled code and compiled code together in an
 extremely compatible manner.
@@ -86,15 +86,14 @@ Currently this means, you need to use one of these compilers:
 Python
 ======
 
-Python Version 2.6, 2.7 or 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11
-are supported. If at any moment, there is a stable Python release that
-is not in this list, rest assured it is being worked on and will be
-added.
+Python Version 2.6, 2.7 or 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, 3.11 are
+supported. If at any moment, there is a stable Python release that is
+not in this list, rest assured it is being worked on and will be added.
 
 .. important::
 
-   For Python 3.3/3.4 and *only* those, we need other Python version as
-   a *compile time* dependency.
+   For Python 3.4 and *only* that version, we need other Python version
+   as a *compile time* dependency.
 
    Nuitka itself is fully compatible with all listed versions, but Scons
    as an internally used tool is not.
@@ -1479,7 +1478,7 @@ the 14.3 based version is recommended.
 +------------------+-------------+-------------------------------+
 | 14.0             | 2015        | 3.5, 3.6, 3.7, 3.8            |
 +------------------+-------------+-------------------------------+
-| 10.0             | 2010        | 3.3, 3.4                      |
+| 10.0             | 2010        | 3.4                           |
 +------------------+-------------+-------------------------------+
 | 9.0              | 2008        | 2.6, 2.7                      |
 +------------------+-------------+-------------------------------+

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/MainControl.py

@@ -65,6 +65,7 @@ from nuitka.Progress import (
 )
 from nuitka.PythonFlavors import (
     isApplePython,
+    isArchPackagePython,
     isDebianPackagePython,
     isFedoraPackagePython,
     isNuitkaPython,
@@ -608,13 +609,12 @@ def runSconsBackend():
 
     if isDebianPackagePython():
         options["debian_python"] = asBoolStr(True)
-
     if isFedoraPackagePython():
         options["fedora_python"] = asBoolStr(True)
-
+    if isArchPackagePython():
+        options["arch_python"] = asBoolStr(True)
     if isApplePython():
         options["apple_python"] = asBoolStr(True)
-
     if isPyenvPython():
         options["pyenv_python"] = asBoolStr(True)
 
@@ -1091,7 +1091,7 @@ not use compiled code while it exists."""
 
     # Execute the module immediately if option was given.
     if Options.shallExecuteImmediately():
-        general.info("Launching '%s'" % run_filename)
+        general.info("Launching '%s'." % run_filename)
 
         if Options.shallMakeModule():
             executeModule(

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/Options.py

@@ -366,7 +366,12 @@ Error, the Python from Windows app store is not supported.""",
     if options.is_onefile:
         options.is_standalone = True
 
-    # Standalone implies no_site build
+    # macOS bundle implies standalone build.
+    if shallCreateAppBundle():
+        options.is_standalone = True
+
+    # Standalone implies no_site build unless overridden, therefore put it
+    # at start of flags, so "site" can override it.
     if options.is_standalone:
         options.python_flags.insert(0, "no_site")
 

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/PythonFlavors.py

@@ -34,6 +34,7 @@ from nuitka.utils.FileOperations import (
 )
 from nuitka.utils.Utils import (
     isAndroidBasedLinux,
+    isArchBasedLinux,
     isFedoraBasedLinux,
     isLinux,
     isMacOS,
@@ -237,6 +238,16 @@ def isFedoraPackagePython():
     return system_prefix_path == "/usr"
 
 
+def isArchPackagePython():
+    """Is the Python from a Fedora package."""
+    if not isArchBasedLinux():
+        return False
+
+    system_prefix_path = getSystemPrefixPath()
+
+    return system_prefix_path == "/usr"
+
+
 def isCPythonOfficialPackage():
     """Official CPython download, kind of hard to detect since self-compiled doesn't change much."""
 
@@ -277,6 +288,8 @@ def getPythonFlavorName():
         return "Debian Python"
     elif isFedoraPackagePython():
         return "Fedora Python"
+    elif isArchPackagePython():
+        return "Arch Python"
     elif isHomebrewPython():
         return "Homebrew Python"
     elif isApplePython():

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/PythonVersions.py

@@ -37,7 +37,6 @@ def getSupportedPythonVersions():
     return (
         "2.6",
         "2.7",
-        "3.3",
         "3.4",
         "3.5",
         "3.6",
@@ -332,6 +331,12 @@ def getSystemPrefixPath():
 
             sys_prefix = getDirectoryRealPath(sys_prefix)
 
+        # Self-compiled Python version in source tree
+        if os.path.isdir(
+            os.path.join(os.path.dirname(os.path.realpath(sys.executable)), "PCbuild")
+        ):
+            sys_prefix = os.path.dirname(os.path.realpath(sys.executable))
+
         _the_sys_prefix = sys_prefix
 
     return _the_sys_prefix

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V1.9.3
+Nuitka V1.9.6
 Copyright (C) 2023 Kay Hayen."""
 
 

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/Backend.scons

@@ -599,6 +599,8 @@ def _detectPythonHeaderPath():
             os.path.join(
                 python_prefix_external, "include", "python" + python_abi_version
             ),
+            # CPython source code checkout
+            os.path.join(python_prefix_external, "Include"),
             # Haiku specific paths:
             os.path.join(
                 python_prefix_external, "develop/headers", "python" + python_abi_version

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/SconsCompilerSettings.py

@@ -164,6 +164,9 @@ def _enableLtoSettings(
     elif env.fedora_python:
         lto_mode = True
         reason = "known to be supported (Fedora Python)"
+    elif env.arch_python:
+        lto_mode = True
+        reason = "known to be supported (Arch Python)"
     elif (
         env.debian_python
         and env.gcc_mode

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/SconsUtils.py

@@ -30,8 +30,13 @@ from nuitka.__past__ import basestring, unicode
 from nuitka.containers.OrderedDicts import OrderedDict
 from nuitka.Tracing import scons_details_logger, scons_logger
 from nuitka.utils.Execution import executeProcess
-from nuitka.utils.FileOperations import getFileContentByLine, openTextFile
-from nuitka.utils.Utils import isLinux, isMacOS, isPosixWindows
+from nuitka.utils.FileOperations import (
+    getFileContentByLine,
+    getWindowsShortPathName,
+    isFilesystemEncodable,
+    openTextFile,
+)
+from nuitka.utils.Utils import isLinux, isMacOS, isPosixWindows, isWin32Windows
 
 
 def initScons():
@@ -238,6 +243,7 @@ def createEnvironment(
     env.nuitka_python = getArgumentBool("nuitka_python", False)
     env.debian_python = getArgumentBool("debian_python", False)
     env.fedora_python = getArgumentBool("fedora_python", False)
+    env.arch_python = getArgumentBool("arch_python", False)
     env.msys2_mingw_python = getArgumentBool("msys2_mingw_python", False)
     env.anaconda_python = getArgumentBool("anaconda_python", False)
     env.pyenv_python = getArgumentBool("pyenv_python", False)
@@ -542,32 +548,36 @@ def scanSourceDir(env, dirname, plugins):
     # name.
     added_path = False
 
-    for filename in sorted(os.listdir(dirname)):
-        if filename.endswith(".h") and plugins and not added_path:
+    for filename_base in sorted(os.listdir(dirname)):
+        if filename_base.endswith(".h") and plugins and not added_path:
             # Adding path for source paths on the fly, spell-checker: ignore cpppath
             env.Append(CPPPATH=[dirname])
             added_path = True
 
         # Only C files are of interest here.
-        if not filename.endswith((".c", "cpp")) or not filename.startswith(
+        if not filename_base.endswith((".c", "cpp")) or not filename_base.startswith(
             ("module.", "__", "plugin.")
         ):
             continue
 
-        filename = os.path.join(dirname, filename)
+        filename = os.path.join(dirname, filename_base)
 
-        target_file = filename
+        target_filename = filename
+
+        if isWin32Windows() and not isFilesystemEncodable(filename_base):
+            target_filename = getWindowsShortPathName(target_filename)
+            target_filename = os.path.normcase(target_filename)
 
         # We pretend to use C++ if no C11 compiler is present.
         if env.c11_mode:
-            yield filename
+            yield target_filename
         else:
             if filename.endswith(".c"):
-                target_file += "pp"  # .cpp" suffix then
+                target_filename += "pp"  # .cpp" suffix then
 
-                os.rename(filename, target_file)
+                os.rename(filename, target_filename)
 
-            yield target_file
+            yield target_filename
 
 
 def makeCLiteral(value):

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/include/nuitka/safe_string_ops.h

@@ -40,9 +40,11 @@ extern void appendWStringSafeW(wchar_t *target, wchar_t const *source, size_t bu
 /* Get OS error code and print it to stderr. */
 #ifdef _WIN32
 typedef DWORD error_code_t;
+#define ERROR_CODE_FORMAT_STR "%ld"
 static inline error_code_t getCurrentErrorCode(void) { return GetLastError(); }
 #else
 typedef int error_code_t;
+#define ERROR_CODE_FORMAT_STR "%d"
 static inline error_code_t getCurrentErrorCode(void) { return errno; }
 #endif
 extern void printOSErrorMessage(char const *message, error_code_t error_code);

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/CompiledFunctionType.c

@@ -909,11 +909,6 @@ void _initCompiledFunctionType(void) {
         }
     }
 #endif
-
-#ifdef _NUITKA_PLUGIN_DILL_ENABLED
-    // TODO: Move this to a __nuitka__ module maybe
-    PyObject_SetAttrString((PyObject *)builtin_module, "compiled_function", (PyObject *)&Nuitka_Function_Type);
-#endif
 }
 
 // Shared implementations for empty functions. When a function body is empty, but

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/CompiledMethodType.c

@@ -559,11 +559,6 @@ PyTypeObject Nuitka_Method_Type = {
 
 void _initCompiledMethodType(void) {
     Nuitka_PyType_Ready(&Nuitka_Method_Type, &PyMethod_Type, false, true, false, false, false);
-
-#ifdef _NUITKA_PLUGIN_DILL_ENABLED
-    // TODO: Move this to a __nuitka__ module maybe
-    PyObject_SetAttrString((PyObject *)builtin_module, "compiled_method", (PyObject *)&Nuitka_Method_Type);
-#endif
 }
 
 PyObject *Nuitka_Method_New(struct Nuitka_FunctionObject *function, PyObject *object, PyObject *klass) {

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersComparisonEq.c

@@ -11770,7 +11770,7 @@ static PyObject *COMPARE_EQ_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11832,7 +11832,7 @@ static bool COMPARE_EQ_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersComparisonGe.c

@@ -11573,7 +11573,7 @@ static PyObject *COMPARE_GE_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11637,7 +11637,7 @@ static bool COMPARE_GE_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersComparisonGt.c

@@ -11557,7 +11557,7 @@ static PyObject *COMPARE_GT_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11621,7 +11621,7 @@ static bool COMPARE_GT_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersComparisonLe.c

@@ -11659,7 +11659,7 @@ static PyObject *COMPARE_LE_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11723,7 +11723,7 @@ static bool COMPARE_LE_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersComparisonLt.c

@@ -11643,7 +11643,7 @@ static PyObject *COMPARE_LT_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11707,7 +11707,7 @@ static bool COMPARE_LT_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersComparisonNe.c

@@ -11681,7 +11681,7 @@ static PyObject *COMPARE_NE_OBJECT_LONG_CLONG(PyObject *operand1, long operand2)
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 
@@ -11742,7 +11742,7 @@ static bool COMPARE_NE_CBOOL_LONG_CLONG(PyObject *operand1, long operand2) {
     }
 
     Py_ssize_t operand2_digit_count = 0;
-    digit operand2_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit operand2_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = operand2_abs_ival;
 

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersDictionariesGenerated.c

@@ -727,7 +727,7 @@ static PyObject *COPY_DICT_KW(PyObject *dict_value) {
 
                         Py_INCREF(value);
                         PyObject *key = *key_ptr;
-                        if (is_unicode) {
+                        if (is_unicode == false) {
                             if (unlikely(!checkKeywordType(key))) {
                                 had_kw_error = true;
                             }

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersFilesystemPaths.c

@@ -749,7 +749,7 @@ bool expandTemplatePathW(wchar_t *target, wchar_t const *source, size_t buffer_s
                     }
                 } else if (wcsicmp(var_name, L"PID") == 0) {
                     char pid_buffer[128];
-                    snprintf(pid_buffer, sizeof(pid_buffer), "%d", GetCurrentProcessId());
+                    snprintf(pid_buffer, sizeof(pid_buffer), "%ld", GetCurrentProcessId());
 
                     appendStringSafeW(target, pid_buffer, buffer_size);
                 } else if (wcsicmp(var_name, L"HOME") == 0) {

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/HelpersSafeStrings.c

@@ -133,7 +133,7 @@ void printOSErrorMessage(char const *message, error_code_t error_code) {
     FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL,
                   error_code, MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), (LPTSTR)&err_buffer, 0, NULL);
 
-    fprintf(stderr, "%s ([Error %d] %s)\n", message, error_code, err_buffer);
+    fprintf(stderr, "%s ([Error " ERROR_CODE_FORMAT_STR "] %s)\n", message, error_code, err_buffer);
 #else
     fprintf(stderr, "%s: %s\n", message, strerror(error_code));
 #endif

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/MainProgram.c

@@ -1524,7 +1524,6 @@ orig_argv = argv;
 
             CALL_FUNCTION_WITH_KEYARGS(tstate, main_function, kw_args);
         }
-        static int loky_joblib_parent_pid_arg = 0;
 
         int exit_code = HANDLE_PROGRAM_EXIT(tstate);
 

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/MetaPathBasedLoader.c

@@ -64,7 +64,7 @@ static inline bool isVerbose(void) { return false; }
 static struct Nuitka_MetaPathBasedLoaderEntry *loader_entries = NULL;
 
 static bool hasFrozenModule(char const *name) {
-    for (struct _frozen const *p = PyImport_FrozenModules;; p++) {
+    for (struct _frozen const *p = PyImport_FrozenModules; p != NULL; p++) {
         if (p->name == NULL) {
             return false;
         }

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/build/static_src/MetaPathBasedLoaderResourceReaderFiles.c

@@ -221,6 +221,16 @@ static PyObject *Nuitka_ResourceReaderFiles_read_text(struct Nuitka_ResourceRead
     return result;
 }
 
+static PyObject *Nuitka_ResourceReaderFiles_exists(struct Nuitka_ResourceReaderFilesObject *files, PyObject *args,
+                                                   PyObject *kwds) {
+
+    PyThreadState *tstate = PyThreadState_GET();
+    PyObject *file_name = _Nuitka_ResourceReaderFiles_GetPath(tstate, files);
+    PyObject *result = OS_PATH_FILE_EXISTS(tstate, file_name);
+    Py_DECREF(file_name);
+    return result;
+}
+
 //    @abc.abstractmethod
 //    def is_dir(self) -> bool:
 //        """
@@ -451,6 +461,7 @@ static PyMethodDef Nuitka_ResourceReaderFiles_methods[] = {
     {"iterdir", (PyCFunction)Nuitka_ResourceReaderFiles_iterdir, METH_NOARGS, NULL},
     {"read_bytes", (PyCFunction)Nuitka_ResourceReaderFiles_read_bytes, METH_NOARGS, NULL},
     {"read_text", (PyCFunction)Nuitka_ResourceReaderFiles_read_text, METH_VARARGS | METH_KEYWORDS, NULL},
+    {"exists", (PyCFunction)Nuitka_ResourceReaderFiles_exists, METH_NOARGS, NULL},
     {"is_dir", (PyCFunction)Nuitka_ResourceReaderFiles_is_dir, METH_NOARGS, NULL},
     {"is_file", (PyCFunction)Nuitka_ResourceReaderFiles_is_file, METH_NOARGS, NULL},
     {"joinpath", (PyCFunction)Nuitka_ResourceReaderFiles_joinpath, METH_VARARGS | METH_KEYWORDS, NULL},

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/code_generation/templates/CodeTemplatesModules.py

@@ -308,12 +308,29 @@ PyObject *modulecode_%(module_identifier)s(PyThreadState *tstate, PyObject *modu
         init_done = true;
     }
 
+#if defined(_NUITKA_MODULE) && %(is_top)d
+    PyObject *pre_load = IMPORT_EMBEDDED_MODULE(tstate, %(module_name_cstr)s "-preLoad");
+    if (pre_load == NULL) {
+        return NULL;
+    }
+#endif
+
     // PRINT_STRING("in init%(module_identifier)s\n");
 
     moduledict_%(module_identifier)s = MODULE_DICT(module_%(module_identifier)s);
 
 #ifdef _NUITKA_PLUGIN_DILL_ENABLED
-    registerDillPluginTables(tstate, loader_entry->name, &_method_def_reduce_compiled_function, &_method_def_create_compiled_function);
+    {
+        char const *module_name_c;
+        if (loader_entry != NULL) {
+            module_name_c = loader_entry->name;
+        } else {
+            PyObject *module_name = GET_STRING_DICT_VALUE(moduledict_%(module_identifier)s, (Nuitka_StringObject *)const_str_plain___name__);
+            module_name_c = Nuitka_String_AsString(module_name);
+        }
+
+        registerDillPluginTables(tstate, module_name_c, &_method_def_reduce_compiled_function, &_method_def_create_compiled_function);
+    }
 #endif
 
     // Set "__compiled__" to what version information we have.

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/code_generation/templates_c/HelperDictionaryCopy.c.j2

@@ -201,7 +201,7 @@ else
 {% endif %}
                 PyObject *key = *key_ptr;
 {% if per_key_code %}
-                if (is_unicode) {
+                if (is_unicode == false) {
                     {{ per_key_code }}
                 }
 {% endif %}

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/code_generation/templates_c/HelperLongTools.c.j2

@@ -31,7 +31,7 @@
     }
 
     Py_ssize_t {{operand}}_digit_count = 0;
-    digit {{operand}}_digits[5]; // Could be more minimal and depend on sizeof(digit)
+    digit {{operand}}_digits[5] = {0}; // Could be more minimal and depend on sizeof(digit)
     {
         unsigned long t = {{operand}}_abs_ival;
 

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/distutils/DistutilCommands.py

@@ -323,7 +323,9 @@ class build(distutils.command.build.build):
                 for option, value in toml_options.get("nuitka", {}).items():
                     command.extend(self._parseOptionsEntry(option, value))
 
-                for option, value in toml_options.get("tool.nuitka", {}).items():
+                for option, value in (
+                    toml_options.get("tool", {}).get("nuitka", {}).items()
+                ):
                     command.extend(self._parseOptionsEntry(option, value))
 
             # Process any extra options from setuptools

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/nodes/PackageMetadataNodes.py

@@ -85,9 +85,8 @@ class ExpressionPkgResourcesRequireCall(ExpressionPkgResourcesRequireCallBase):
                 resources_module.extern.packaging.requirements.InvalidRequirement
             )
         except AttributeError:
-            InvalidRequirement = (
-                resources_module.packaging.requirements.InvalidRequirement
-            )
+            # Very old versions of pkg_resources do not have it
+            InvalidRequirement = TypeError
 
         args = tuple(
             element.getCompileTimeConstant() for element in self.subnode_requirements

{Nuitka-winsvc-1.9.3 → Nuitka-winsvc-1.9.6}/nuitka/plugins/PluginBase.py

@@ -1087,8 +1087,11 @@ except ImportError:
         if shallShowExecutedCommands():
             self.info("Executing query command:\n%s" % cmd)
 
+        env = dict(os.environ)
+        env["PYTHONIOENCODING"] = "utf8"
+
         try:
-            feedback = check_output([sys.executable, "-c", cmd])
+            feedback = check_output([sys.executable, "-c", cmd], env=env)
         except NuitkaCalledProcessError as e:
             if e.returncode == 38:
                 return None
@@ -1211,18 +1214,13 @@ except ImportError:
                 "no_annotations": hasPythonFlagNoAnnotations(),
                 # Querying package properties
                 "has_builtin_module": isBuiltinModuleName,
+                # Architectures
+                "arch_x86": getArchitecture() == "x86",
+                "arch_amd64": getArchitecture() == "x86_64",
+                "arch_arm64": getArchitecture() == "arm64",
             }
         )
 
-        if isWin32Windows() or isMacOS():
-            context.update(
-                {
-                    "arch_x86": getArchitecture() == "x86",
-                    "arch_amd64": getArchitecture() == "x86_64",
-                    "arch_arm64": getArchitecture() == "arm64",
-                }
-            )
-
         versions = getTestExecutionPythonVersions()
 
         for version in versions: