Nuitka-winsvc 2.1.2__tar.gz → 2.1.4__tar.gz

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/Nuitka_winsvc.egg-info/PKG-INFO

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

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/PKG-INFO

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

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/OptionParsing.py

@@ -36,15 +36,18 @@ from nuitka.Version import getCommercialVersion, getNuitkaVersion
 
 # Indicator if we were called as "nuitka-run" in which case we assume some
 # other defaults and work a bit different with parameters.
-is_nuitka_run = os.path.basename(sys.argv[0]).lower().endswith("-run")
+_nuitka_binary_name = os.path.basename(sys.argv[0])
+if _nuitka_binary_name == "__main__.py":
+    _nuitka_binary_name = "%s -m nuitka" % os.path.basename(sys.executable)
+is_nuitka_run = _nuitka_binary_name.lower().endswith("-run")
 
 if not is_nuitka_run:
-    usage = "usage: %prog [--module] [--run] [options] main_module.py"
+    usage_template = "usage: %s [--module] [--run] [options] main_module.py"
 else:
-    usage = "usage: %prog [options] main_module.py"
+    usage_template = "usage: %s [options] main_module.py"
 
 
-parser = makeOptionsParser(usage=usage)
+parser = makeOptionsParser(usage=usage_template % _nuitka_binary_name)
 
 parser.add_option(
     "--version",

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/Options.py

@@ -1068,6 +1068,7 @@ make sure that is intended."""
         and not shallMakeModule()
         and not shallUseStaticLibPython()
         and getSystemStaticLibPythonPath() is not None
+        and not shallUsePythonDebug()
     ):
         Tracing.options_logger.info(
             """Detected static libpython to exist, consider '--static-libpython=yes' for better performance, \

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/Version.py

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

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/build/SconsUtils.py

@@ -609,7 +609,7 @@ def scanSourceDir(env, dirname, plugins):
 
         # Only C files are of interest here.
         if not hasFilenameExtension(
-            filename_base, (".c", "cpp")
+            filename_base, (".c", ".cpp")
         ) or not filename_base.startswith(("module.", "__", "plugin.")):
             continue
 

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/build/static_src/HelpersFilesystemPaths.c

@@ -900,12 +900,18 @@ bool expandTemplatePath(char *target, char const *source, size_t buffer_size) {
                 appendStringSafe(target, home_path, buffer_size);
                 is_path = true;
             } else if (strcasecmp(var_name, "CACHE_DIR") == 0) {
-                if (expandTemplatePath(target, "{HOME}", buffer_size - strlen(target)) == false) {
-                    return false;
-                }
+                char const *xdg_cache_home = getenv("XDG_CACHE_HOME");
+
+                if (xdg_cache_home != NULL && xdg_cache_home[0] == '/') {
+                    appendStringSafe(target, xdg_cache_home, buffer_size);
+                } else {
+                    if (expandTemplatePath(target, "{HOME}", buffer_size - strlen(target)) == false) {
+                        return false;
+                    }
 
-                appendCharSafe(target, '/', buffer_size);
-                appendStringSafe(target, ".cache", buffer_size);
+                    appendCharSafe(target, '/', buffer_size);
+                    appendStringSafe(target, ".cache", buffer_size);
+                }
                 is_path = true;
 #ifdef NUITKA_COMPANY_NAME
             } else if (strcasecmp(var_name, "COMPANY") == 0) {

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/build/static_src/HelpersLists.c

@@ -318,16 +318,16 @@ bool LIST_EXTEND_FOR_UNPACK(PyThreadState *tstate, PyObject *list, PyObject *oth
 #endif
 
 bool LIST_APPEND1(PyObject *target, PyObject *item) {
-#if _NUITKA_EXPERIMENTAL_DISABLE_LIST_OPT
-    int res = PyList_Append(target, item);
-    Py_DECREF(item);
-    return res == 0;
-#else
     CHECK_OBJECT(target);
     assert(PyList_CheckExact(target));
 
     CHECK_OBJECT(item);
 
+#if _NUITKA_EXPERIMENTAL_DISABLE_LIST_OPT
+    int res = PyList_Append(target, item);
+    Py_DECREF(item);
+    return res == 0;
+#else
     PyListObject *list = (PyListObject *)target;
 
     Py_ssize_t cur_size = PyList_GET_SIZE(list);
@@ -346,15 +346,15 @@ bool LIST_APPEND1(PyObject *target, PyObject *item) {
 }
 
 bool LIST_APPEND0(PyObject *target, PyObject *item) {
-#if _NUITKA_EXPERIMENTAL_DISABLE_LIST_OPT
-    int res = PyList_Append(target, item);
-    return res == 0;
-#else
     CHECK_OBJECT(target);
     assert(PyList_CheckExact(target));
 
     CHECK_OBJECT(item);
 
+#if _NUITKA_EXPERIMENTAL_DISABLE_LIST_OPT
+    int res = PyList_Append(target, item);
+    return res == 0;
+#else
     PyListObject *list = (PyListObject *)target;
 
     Py_ssize_t cur_size = PyList_GET_SIZE(list);
@@ -517,7 +517,16 @@ PyObject *LIST_INDEX3(PyThreadState *tstate, PyObject *list, PyObject *item, PyO
         return NULL;
     }
 
-    Py_ssize_t start_ssize = PyLong_AsSsize_t(start_index);
+    Py_ssize_t start_ssize;
+#if PYTHON_VERSION < 0x300
+    if (PyInt_CheckExact(start_index)) {
+        start_ssize = PyInt_AS_LONG(start_index);
+    } else {
+        start_ssize = PyLong_AsSsize_t(start_index);
+    }
+#else
+    start_ssize = PyLong_AsSsize_t(start_index);
+#endif
 
     return _LIST_INDEX_COMMON(tstate, (PyListObject *)list, item, start_ssize, Py_SIZE(list));
 }
@@ -536,7 +545,16 @@ PyObject *LIST_INDEX4(PyThreadState *tstate, PyObject *list, PyObject *item, PyO
         return NULL;
     }
 
-    Py_ssize_t start_ssize = PyLong_AsSsize_t(start_index);
+    Py_ssize_t start_ssize;
+#if PYTHON_VERSION < 0x300
+    if (PyInt_CheckExact(start_index)) {
+        start_ssize = PyInt_AS_LONG(start_index);
+    } else {
+        start_ssize = PyLong_AsSsize_t(start_index);
+    }
+#else
+    start_ssize = PyLong_AsSsize_t(start_index);
+#endif
 
     PyObject *stop_index = Nuitka_Number_IndexAsLong(stop);
 
@@ -548,7 +566,16 @@ PyObject *LIST_INDEX4(PyThreadState *tstate, PyObject *list, PyObject *item, PyO
         return NULL;
     }
 
-    Py_ssize_t stop_ssize = PyLong_AsSsize_t(stop_index);
+    Py_ssize_t stop_ssize;
+#if PYTHON_VERSION < 0x300
+    if (PyInt_CheckExact(stop_index)) {
+        stop_ssize = PyInt_AS_LONG(stop_index);
+    } else {
+        stop_ssize = PyLong_AsSsize_t(stop_index);
+    }
+#else
+    stop_ssize = PyLong_AsSsize_t(stop_index);
+#endif
 
     return _LIST_INDEX_COMMON(tstate, (PyListObject *)list, item, start_ssize, stop_ssize);
 }
@@ -556,6 +583,7 @@ PyObject *LIST_INDEX4(PyThreadState *tstate, PyObject *list, PyObject *item, PyO
 bool LIST_INSERT(PyThreadState *tstate, PyObject *list, PyObject *index, PyObject *item) {
     CHECK_OBJECT(list);
     assert(PyList_CheckExact(list));
+    CHECK_OBJECT(index);
     CHECK_OBJECT(item);
 
     // TODO: Avoid the clear, by having this as a variant that doesn't set the
@@ -569,7 +597,16 @@ bool LIST_INSERT(PyThreadState *tstate, PyObject *list, PyObject *index, PyObjec
         return false;
     }
 
-    Py_ssize_t index_ssize = PyLong_AsSsize_t(index_long);
+    Py_ssize_t index_ssize;
+#if PYTHON_VERSION < 0x300
+    if (PyInt_CheckExact(index_long)) {
+        index_ssize = PyInt_AS_LONG(index_long);
+    } else {
+        index_ssize = PyLong_AsSsize_t(index_long);
+    }
+#else
+    index_ssize = PyLong_AsSsize_t(index_long);
+#endif
 
     LIST_INSERT_CONST(list, index_ssize, item);
     return true;

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/build/static_src/HelpersProfiling.c

@@ -44,7 +44,9 @@ void startProfiling(void) {
         abort();
     }
 
-    PyObject *result = CALL_FUNCTION_WITH_SINGLE_ARG(PyObject_GetAttrString(vmprof_module, "enable"),
+    PyThreadState *tstate = PyThreadState_GET();
+
+    PyObject *result = CALL_FUNCTION_WITH_SINGLE_ARG(tstate, PyObject_GetAttrString(vmprof_module, "enable"),
                                                      PyInt_FromLong(fileno(tempfile_profile)));
 
     if (result == NULL) {
@@ -65,7 +67,7 @@ void stopProfiling(void) {
     PyTracebackObject *save_exception_tb;
     FETCH_ERROR_OCCURRED(tstate, &save_exception_type, &save_exception_value, &save_exception_tb);
 
-    PyObject *result = CALL_FUNCTION_NO_ARGS(PyObject_GetAttrString(vmprof_module, "disable"));
+    PyObject *result = CALL_FUNCTION_NO_ARGS(tstate, PyObject_GetAttrString(vmprof_module, "disable"));
 
     if (result == NULL) {
         CLEAR_ERROR_OCCURRED(tstate);

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/code_generation/GlobalConstants.py

@@ -91,6 +91,8 @@ def getConstantDefaultPopulation():
         # Meta path based loader.
         "read",
         "rb",
+        # List methods
+        "remove",
         # File handling
         "/",
         "\\",

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/code_generation/ListCodes.py

@@ -421,7 +421,7 @@ def generateListOperationRemoveCode(to_name, expression, emit, context):
         # this call is also very bad.
         emit("assert(PyList_CheckExact(%s));" % list_arg_name)
         emit(
-            '%s = PyObject_CallMethod(%s, (char *)"remove", "O", %s);'
+            "%s = PyObject_CallMethodObjArgs(%s, const_str_plain_remove, %s, NULL);"
             % (result_name, list_arg_name, value_arg_name)
         )
 

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/code_generation/templates/CodeTemplatesConstants.py

@@ -25,7 +25,7 @@ PyObject *Nuitka_dunder_compiled_value = NULL;
 #ifdef _NUITKA_STANDALONE
 extern PyObject *getStandaloneSysExecutablePath(PyObject *basename);
 
-static PyObject *STRIP_DIRNAME(PyObject *path) {
+NUITKA_MAY_BE_UNUSED static PyObject *STRIP_DIRNAME(PyObject *path) {
 #if PYTHON_VERSION < 0x300
     char const *path_cstr = PyString_AS_STRING(path);
 

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/plugins/PluginBase.py

@@ -17,6 +17,7 @@ import functools
 import inspect
 import os
 import sys
+import unittest
 
 from nuitka import Options
 from nuitka.__past__ import iter_modules, unicode
@@ -135,6 +136,7 @@ def _getEvaluationContext():
             "deployment": isDeploymentMode(),
             # Querying package versions.
             "version": _getPackageVersion,
+            "version_str": _getPackageVersionStr,
             "get_dist_name": _getDistributionNameFromPackageName,
             "plugin": _isPluginActive,
             "no_asserts": hasPythonFlagNoAsserts(),
@@ -155,6 +157,7 @@ def _getEvaluationContext():
             "os": os,
             "importlib": _getImportLibModule(),
             "appdirs": getAppdirsModule(),
+            "unittest": unittest,
             # Python version string
             "python_version_str": python_version_str,
             "python_version_full_str": python_version_full_str,
@@ -270,6 +273,15 @@ def _getPackageVersion(distribution_name):
     return _package_versions[distribution_name]
 
 
+def _getPackageVersionStr(distribution_name):
+    version = _getPackageVersion(distribution_name)
+
+    if version is not None:
+        version = ".".join(str(d) for d in version)
+
+    return version
+
+
 def _getModuleDirectory(module_name):
     from nuitka.importing.Importing import locateModule
 

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/plugins/standard/DillPlugin/dill-postLoad.py

@@ -236,6 +236,10 @@ def save_compiled_function(pickler, obj):
             dill._dill.StockPickler.save_global(pickler, obj)
 
 
+if __compiled__.standalone:  # pylint: disable=undefined-variable
+    builtins.compiled_method = compiled_method
+    builtins.compiled_function = compiled_function
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/plugins/standard/ImplicitImports.py

@@ -659,12 +659,24 @@ According to Yaml 'overridden-environment-variables' configuration."""
         "transformers.utils.dummy_tf_objects",  # Not performance relevant.
         "rich",  #  Not performance relevant and memory leaking due to empty compiled cell leaks
         "altair.vegalite.v5.schema",  # Not performance relevant.
+        "azure",  # Not performance relevant.
+    )
+
+    unworthy_modulename_patterns = (
+        "tensorflow.*test",  # Not performance relevant.
+        "tensorflow.**.test_util",  # Not performance relevant.
     )
 
     def decideCompilation(self, module_name):
         if module_name.hasOneOfNamespaces(self.unworthy_namespaces):
             return "bytecode"
 
+        is_match, _reason = module_name.matchesToShellPatterns(
+            self.unworthy_modulename_patterns
+        )
+        if is_match:
+            return "bytecode"
+
     def onModuleUsageLookAhead(
         self, module_name, module_filename, module_kind, get_module_source
     ):

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/plugins/standard/MatplotlibPlugin.py

@@ -91,6 +91,18 @@ https://matplotlib.org/stable/users/installing/environment_variables_faq.html#en
 
         return info
 
+    def getImplicitImports(self, module):
+        # Make sure the used Qt namespace is included in compilation, mostly for
+        # accelerated mode, but also to prevent people from accidentally
+        # removing it.
+        if module.getFullName() != "matplotlib":
+            return
+
+        matplotlib_info = self._getMatplotlibInfo()
+
+        # Make sure, the default backend is included.
+        yield "matplotlib.backends.backend_%s" % matplotlib_info.backend.lower()
+
     def considerDataFiles(self, module):
         if module.getFullName() != "matplotlib":
             return
@@ -168,6 +180,10 @@ https://matplotlib.org/stable/users/installing/environment_variables_faq.html#en
             if hasActivePlugin("tk-inter"):
                 return True, "Needed for tkinter matplotlib backend"
 
+        if module_name == "matplotlib.backends.backend_qtagg":
+            if getActiveQtPluginBindingName() is not None:
+                return True, "Needed for qt matplotlib backend"
+
     def createPreModuleLoadCode(self, module):
         """Method called when a module is being imported.
 

{Nuitka-winsvc-2.1.2 → Nuitka-winsvc-2.1.4}/nuitka/plugins/standard/OptionsNannyPlugin.py

@@ -45,26 +45,28 @@ class NuitkaPluginOptionsNanny(NuitkaPluginBase):
         if support_info == "ignore":
             return
 
-        if support_info != "parameter":
+        if support_info == "parameter":
+            message = "Module has parameter: " + description
+        elif support_info == "plugin":
+            message = "Module has plugin consideration: " + description
+        else:
             if condition != "True":
                 problem_desc = (
-                    "incomplete support due to untrue condition '%s'" % condition
+                    " with incomplete support due to untrue condition '%s'" % condition
                 )
             else:
-                problem_desc = "incomplete support"
+                problem_desc = " with incomplete support"
 
-            message = "Using module '%s' (version %s) with %s: %s" % (
+            message = "Using module '%s' (version %s)%s: %s" % (
                 full_name,
                 ".".join(str(d) for d in self.getPackageVersion(full_name)),
                 problem_desc,
                 description,
             )
-        else:
-            message = "Module has parameter: " + description
 
         if support_info == "error":
             self.sysexit(message)
-        elif support_info in ("warning", "parameter"):
+        elif support_info in ("warning", "parameter", "plugin"):
             self.warning(message)
         elif support_info == "info":
             self.info(message)