Nuitka-winsvc 2.1.1__tar.gz → 2.1.3__tar.gz

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.3}/Nuitka_winsvc.egg-info/PKG-INFO

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

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.3}/PKG-INFO

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

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.3}/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",
@@ -2001,6 +2004,7 @@ def _considerGithubWorkflowOptions(phase):
         "enable-plugins",
         "disable-plugin",
         "disable-plugins",
+        "user-plugin",
     )
 
     def filterByName(key):

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.3}/nuitka/Version.py

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

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.3}/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.1 → Nuitka-winsvc-2.1.3}/nuitka/build/static_src/HelpersFilesystemPaths.c

@@ -836,7 +836,7 @@ bool expandTemplatePath(char *target, char const *source, size_t buffer_size) {
     char var_name[1024];
     char *w = NULL;
 
-    bool var_started = false;
+    NUITKA_MAY_BE_UNUSED bool var_started = false;
 
     while (*source != 0) {
         if (*source == '{') {

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.3}/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.1 → Nuitka-winsvc-2.1.3}/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.1 → Nuitka-winsvc-2.1.3}/nuitka/plugins/PluginBase.py

@@ -14,10 +14,10 @@ it being used.
 
 import ast
 import functools
-import importlib
 import inspect
 import os
 import sys
+import unittest
 
 from nuitka import Options
 from nuitka.__past__ import iter_modules, unicode
@@ -106,6 +106,15 @@ _module_config_constants = {}
 _module_config_variables = {}
 
 
+def _getImportLibModule():
+    try:
+        import importlib
+    except ImportError:
+        return None
+    else:
+        return importlib
+
+
 def _getEvaluationContext():
     # Using global here, as this is really a singleton, in the form of a module,
     # pylint: disable=global-statement
@@ -145,8 +154,9 @@ def _getEvaluationContext():
             # Frequent used modules
             "sys": sys,
             "os": os,
-            "importlib": importlib,
+            "importlib": _getImportLibModule(),
             "appdirs": getAppdirsModule(),
+            "unittest": unittest,
             # Python version string
             "python_version_str": python_version_str,
             "python_version_full_str": python_version_full_str,
@@ -1259,6 +1269,14 @@ except ImportError:
         # Virtual method, pylint: disable=no-self-use,unused-argument
         return False
 
+    def onClassBodyParsing(self, module_name, class_name, node):
+        # Virtual method, pylint: disable=no-self-use,unused-argument
+        """Provide a different class body for the class of that module.
+
+        Should return a boolean, indicating if any actual change was done.
+        """
+        return False
+
     def getCacheContributionValues(self, module_name):
         """Provide values that represent the include of a plugin on the compilation.
 

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.3}/nuitka/plugins/Plugins.py

@@ -1354,6 +1354,19 @@ class Plugins(object):
                 body=body,
             )
 
+    @classmethod
+    def onClassBodyParsing(cls, provider, class_name, node):
+        module_name = provider.getParentModule().getFullName()
+
+        for plugin in getActivePlugins():
+            # TODO: Could record what classes got modified by what plugin
+            # and in what way checking the return value
+            plugin.onClassBodyParsing(
+                module_name=module_name,
+                class_name=class_name,
+                node=node,
+            )
+
     @classmethod
     def getCacheContributionValues(cls, module_name):
         for plugin in getActivePlugins():

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.3}/nuitka/plugins/standard/AntiBloatPlugin.py

@@ -535,6 +535,66 @@ Error, cannot exec module '%s', context code '%s' due to: %s"""
 
         return result
 
+    def _onClassBodyParsing(self, module_name, anti_bloat_config, class_name, node):
+        replace_code = anti_bloat_config.get("change_class", {}).get(class_name)
+
+        if replace_code == "un-usable":
+            replace_code = """
+'''
+class %(class_name)s:
+    def __init__(self, *args, **kwargs):
+        raise RuntimeError("Must not call %(module_name)s.%(class_name)s")
+'''
+""" % {
+                "module_name": module_name,
+                "class_name": class_name,
+            }
+
+        if replace_code is None:
+            return False
+
+        replacement = self.evaluateExpression(
+            full_name=module_name,
+            expression=replace_code,
+            config_name="module '%s' config 'change_class' of '%s'"
+            % (module_name, class_name),
+            extra_context=self._getContextCode(
+                module_name=module_name, anti_bloat_config=anti_bloat_config
+            ),
+            single_value=True,
+        )
+
+        # Single node is required, extract the generated module body with
+        # single expression only statement value or a function body.
+        replacement = ast.parse(replacement).body[0]
+
+        node.body[:] = replacement.body
+        node.bases = replacement.bases
+
+        if self.show_changes:
+            self.info(
+                "Updated module '%s' class '%s'." % (module_name.asString(), class_name)
+            )
+
+        return True
+
+    def onClassBodyParsing(self, module_name, class_name, node):
+        result = False
+
+        config = self.config.get(module_name, section="anti-bloat")
+
+        if config:
+            for anti_bloat_config in config:
+                if self._onClassBodyParsing(
+                    module_name=module_name,
+                    anti_bloat_config=anti_bloat_config,
+                    class_name=class_name,
+                    node=node,
+                ):
+                    result = True
+
+        return result
+
     def _getModuleBloatModeOverrides(self, using_module_name, intended_module_name):
         while 1:
             config = self.config.get(using_module_name, section="anti-bloat")

{Nuitka-winsvc-2.1.1 → Nuitka-winsvc-2.1.3}/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.
 #