Nuitka-winsvc 2.4.8__cp311-cp311-win_amd64.whl → 2.5.1__cp311-cp311-win_amd64.whl

nuitka/plugins/standard/AntiBloatPlugin.py

@@ -18,7 +18,7 @@ from nuitka.Options import isExperimental
 from nuitka.plugins.YamlPluginBase import NuitkaYamlPluginBase
 from nuitka.utils.ModuleNames import ModuleName
 
-# spell-checker: ignore dask,numba,statsmodels,matplotlib,sqlalchemy,ipykernel
+# spell-checker: ignore dask,numba,statsmodels,matplotlib,sqlalchemy,ipykernel,pyximport
 
 _mode_choices = ("error", "warning", "nofollow", "allow")
 
@@ -111,6 +111,10 @@ class NuitkaPluginAntiBloat(NuitkaYamlPluginBase):
                 noinclude_setuptools_mode,
                 "setuptools",
             )
+            self.handled_modules["wheel.util"] = (
+                noinclude_setuptools_mode,
+                "setuptools",
+            )
         else:
             self.control_tags["use_setuptools"] = True
 
@@ -267,7 +271,7 @@ form 'module_name:[%s]'."""
             dest="show_changes",
             default=False,
             help="""\
-Annotate what changes are by the plugin done.""",
+Annotate what changes are done by the plugin.""",
         )
 
         group.add_option(
@@ -411,7 +415,7 @@ Error, cannot exec module '%s', context code '%s' due to: %s"""
                 replace_dst = self.evaluateExpression(
                     full_name=module_name,
                     expression=replace_code,
-                    config_name="module '%s' config 'replacements' " % module_name,
+                    config_name="module '%s' config 'replacements'" % module_name,
                     extra_context=self._getContextCode(
                         module_name=module_name, anti_bloat_config=anti_bloat_config
                     ),
@@ -556,10 +560,10 @@ Error, cannot exec module '%s', context code '%s' due to: %s"""
     def onFunctionBodyParsing(self, module_name, function_name, body):
         result = False
 
-        config = self.config.get(module_name, section="anti-bloat")
-
-        if config:
-            for anti_bloat_config in config:
+        for anti_bloat_config in self.config.get(module_name, section="anti-bloat"):
+            if self.evaluateCondition(
+                full_name=module_name, condition=anti_bloat_config.get("when", "True")
+            ):
                 if self._onFunctionBodyParsing(
                     module_name=module_name,
                     anti_bloat_config=anti_bloat_config,
@@ -604,7 +608,7 @@ class %(class_name)s:
         replacement = ast.parse(replacement).body[0]
 
         node.body[:] = replacement.body
-        node.bases = replacement.bases
+        node.bases[:] = replacement.bases
 
         if self.show_changes:
             self.info(
@@ -616,10 +620,10 @@ class %(class_name)s:
     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:
+        for anti_bloat_config in self.config.get(module_name, section="anti-bloat"):
+            if self.evaluateCondition(
+                full_name=module_name, condition=anti_bloat_config.get("when", "True")
+            ):
                 if self._onClassBodyParsing(
                     module_name=module_name,
                     anti_bloat_config=anti_bloat_config,
@@ -869,6 +873,13 @@ slow down compilation."""
             if module_name.hasNamespace(handled_module_name):
                 return "bytecode"
 
+        # TODO: Detect effective "change_class" and "change_function"
+        # configuration for standard library modules, but often enough we are
+        # happy to let the bytecode not have the effect, but for these ones it's
+        # required. TODO: Make the compilation mode part of the config.
+        if module_name == "xmlrpc.server":
+            return "compiled"
+
     def onModuleCompleteSet(self, module_set):
         # TODO: Maybe have an entry point that works on the set of names
         # instead, we are not looking at the modules, and most plugins probably

nuitka/plugins/standard/ImplicitImports.py

@@ -102,7 +102,7 @@ class NuitkaPluginImplicitImports(NuitkaYamlPluginBase):
                     for resolved in self._resolveModulePattern(v):
                         yield resolved
                 else:
-                    yield v
+                    yield ModuleName(v)
         elif "*" in dependency or "?" in dependency:
             for resolved in self._resolveModulePattern(dependency):
                 yield resolved
@@ -361,19 +361,7 @@ class NuitkaPluginImplicitImports(NuitkaYamlPluginBase):
                     yield item
 
     def onModuleSourceCode(self, module_name, source_filename, source_code):
-        # Too much code here, pylint: disable=too-many-branches
         # TODO: Move the ones that would be possible to yaml config,
-        # e.g. the numexpr hack.
-
-        if module_name == "numexpr.cpuinfo":
-            # We cannot intercept "is" tests, but need it to be "isinstance",
-            # so we patch it on the file. TODO: This is only temporary, in
-            # the future, we may use optimization that understands the right
-            # hand size of the "is" argument well enough to allow for our
-            # type too.
-            source_code = source_code.replace(
-                "type(attr) is types.MethodType", "isinstance(attr, types.MethodType)"
-            )
 
         if module_name == "site":
             if source_code.startswith("def ") or source_code.startswith("class "):

nuitka/plugins/standard/KivyPlugin.py

@@ -6,7 +6,6 @@
 
 from nuitka.Options import isStandaloneMode
 from nuitka.plugins.PluginBase import NuitkaPluginBase
-from nuitka.utils.Utils import isMacOS, isWin32Windows
 
 
 class NuitkaPluginKivy(NuitkaPluginBase):
@@ -64,7 +63,9 @@ except ImportError:
         return info
 
     def getImplicitImports(self, module):
-        # Using branches to dispatch, pylint: disable=too-many-branches
+        # TODO: Move this all to yaml configuration, we now can
+        # query Kivy installation and use variables to solve some
+        # of the more difficult ones.
 
         full_name = module.getFullName()
 
@@ -92,16 +93,6 @@ except ImportError:
             yield "kivy.graphics.cgl_backend.cgl_sdl2"
         elif full_name == "kivy.graphics.cgl_backend.cgl_glew":
             yield "kivy.graphics.cgl_backend.cgl_gl"
-        elif full_name == "kivymd.app":
-            yield self.locateModules("kivymd.uix")
-        elif full_name == "kivy.core.clipboard":
-            if isWin32Windows():
-                yield "kivy.core.clipboard.clipboard_winctypes"
-            if isMacOS():
-                if self.locateModule("pyobjus"):
-                    yield "kivy.core.clipboard.clipboard_nspaste"
-                else:
-                    yield "kivy.core.clipboard.clipboard_sdl2"
 
     def getExtraDlls(self, module):
         """Copy extra shared libraries or data for this installation.

nuitka/plugins/standard/MatplotlibPlugin.py

@@ -8,6 +8,7 @@ import os
 from nuitka.Options import isStandaloneMode
 from nuitka.plugins.PluginBase import NuitkaPluginBase
 from nuitka.plugins.Plugins import (
+    getActiveQtPlugin,
     getActiveQtPluginBindingName,
     hasActivePlugin,
 )
@@ -76,7 +77,7 @@ from inspect import getsource
                 ),
             )
         except NuitkaCalledProcessError as e:
-            self.debug("Exception during detection: %r" % e)
+            self.debug("Exception during detection: %s" % str(e))
 
             if "MPLBACKEND" not in os.environ:
                 self.sysexit(
@@ -92,6 +93,15 @@ https://matplotlib.org/stable/users/installing/environment_variables_faq.html#en
         if info is None:
             self.sysexit("Error, it seems 'matplotlib' is not installed or broken.")
 
+        # Auto correct for using tk-inter the system setting.
+        if "tk" not in info.backend.lower() and hasActivePlugin("tk-inter"):
+            info = info.replace(backend="TkAgg")
+
+        if info.backend == "QtAgg" and getActiveQtPlugin() is None:
+            self.sysexit(
+                "Error, cannot use 'QtAgg' with not plugin for Qt binding active."
+            )
+
         return info
 
     def getImplicitImports(self, module):
@@ -183,6 +193,7 @@ https://matplotlib.org/stable/users/installing/environment_variables_faq.html#en
             if hasActivePlugin("tk-inter"):
                 return True, "Needed for tkinter matplotlib backend"
 
+        # For Qt binding, include matplotlib backend, spell-checker: ignore qtagg
         if module_name == "matplotlib.backends.backend_qtagg":
             if getActiveQtPluginBindingName() is not None:
                 return True, "Needed for qt matplotlib backend"

nuitka/plugins/standard/MultiprocessingPlugin.py

@@ -9,7 +9,7 @@ point to a "Python.exe" and won't use compiled code by default.
 
 The issue applies to accelerated and standalone mode alike.
 
-spell-checker: ignore joblib
+spell-checker: ignore joblib,anyio
 """
 
 from nuitka import Options
@@ -51,28 +51,21 @@ class NuitkaPluginMultiprocessingWorkarounds(NuitkaPluginBase):
     def createPreModuleLoadCode(module):
         full_name = module.getFullName()
 
-        # TODO: Replace the setting of "sys.frozen" with a change to the source code of the
-        # modules we want to affect from this plugin, it's a huge impact on compatibility
-        # with other things potentially. We should do it, once the anti-bloat engine is
-        # reusable or supports conditional replacements based on plugin activity and is
-        # always on.
-        if full_name == "multiprocessing":
-            code = """\
+        if full_name in ("multiprocessing", "anyio"):
+            yield (
+                """\
 import sys, os
-sys.frozen = 1
 argv0 = sys.argv[0]
 if sys.platform == "win32" and not os.path.exists(argv0) and not argv0.endswith(".exe"):
     argv0 += ".exe"
 
 sys.executable = %s
 sys._base_executable = sys.executable
-""" % (
-                "__nuitka_binary_exe" if Options.isStandaloneMode() else "argv0"
-            )
-            return (
-                code,
+"""
+                % ("__nuitka_binary_exe" if Options.isStandaloneMode() else "argv0"),
                 """\
-Monkey patching "multiprocessing" load environment.""",
+Monkey patching "%s" load environment."""
+                % full_name,
             )
 
     @staticmethod
@@ -80,7 +73,8 @@ Monkey patching "multiprocessing" load environment.""",
         full_name = module.getFullName()
 
         if full_name == "multiprocessing":
-            code = """\
+            yield (
+                """\
 try:
     from multiprocessing.forking import ForkingPickler
 except ImportError:
@@ -99,10 +93,7 @@ def _reduce_compiled_method(m):
 ForkingPickler.register(type(C().f), _reduce_compiled_method)
 if str is bytes:
     ForkingPickler.register(type(C.f), _reduce_compiled_method)
-"""
-
-            return (
-                code,
+""",
                 """\
 Monkey patching "multiprocessing" for compiled methods.""",
             )

nuitka/plugins/standard/PlaywrightPlugin.py

@@ -0,0 +1,184 @@
+#     Copyright 2024, Kevin Rodriguez <mailto:turcioskevinr@gmail.com> find license text at end of file
+
+
+""" Plugin for Playwright.
+
+spell-checker: ignore Playwright
+"""
+
+import os
+
+from nuitka.Options import isStandaloneMode
+from nuitka.plugins.PluginBase import NuitkaPluginBase
+
+
+class NuitkaPluginPlaywright(NuitkaPluginBase):
+    """This class represents the main logic of the plugin."""
+
+    plugin_name = "playwright"
+    plugin_desc = "Required by 'playwright' package."
+
+    def __init__(self, include_browsers):
+        self.include_browsers = list(include_browsers)
+        self.installed_browsers = None
+
+    @staticmethod
+    def isAlwaysEnabled():
+        return True
+
+    @staticmethod
+    def isRelevant():
+        return isStandaloneMode()
+
+    @classmethod
+    def addPluginCommandLineOptions(cls, group):
+        group.add_option(
+            "--playwright-include-browser",
+            action="append",
+            dest="include_browsers",
+            default=[],
+            help="""\
+            Playwright browser to include. Can be specified multiple times. use "all" to include all installed browsers.
+            """,
+        )
+
+    def _getPlaywrightPath(self):
+        """Determine the path of the playwright module."""
+        info = self.locateModule("playwright")
+
+        if info is None:
+            self.sysexit("Error, it seems 'playwright' is not installed or broken.")
+
+        return info
+
+    def _getPlaywrightRegistryDirectory(self):
+        # this is a port of playwright's JS script which determines where the browsers are installed
+
+        env_defined = os.environ.get("PLAYWRIGHT_BROWSERS_PATH")
+        path_home = os.path.expanduser("~")
+        playwright_module_path = self._getPlaywrightPath()
+
+        result = os.path.join(
+            playwright_module_path, "driver", "package", ".local-browsers"
+        )
+
+        # TODO: This is seemingly a test for non-empty directory, which we should
+        # then add to FileOperations.
+
+        if os.path.exists(result) and next(os.scandir(result), False):
+            return result
+        elif env_defined == "0":
+            return result
+        elif env_defined:
+            result = os.path.normpath(env_defined)
+        else:
+            cache_directory = ""
+            if os.name == "posix":
+                cache_directory = os.environ.get(
+                    "XDG_CACHE_HOME", os.path.join(path_home, ".cache")
+                )
+            elif os.name == "darwin":
+                cache_directory = os.path.join(path_home, "Library", "Caches")
+            elif os.name == "nt":
+                cache_directory = os.environ.get(
+                    "LOCALAPPDATA", os.path.join(path_home, "AppData", "Local")
+                )
+
+            result = os.path.join(cache_directory, "ms-playwright")
+
+        if not os.path.isabs(result):
+            init_cwd = os.environ.get("INIT_CWD") or os.getcwd()
+            result = os.path.join(os.path.abspath(init_cwd), result)
+
+        return result
+
+    def getInstalledPlaywrightBrowsers(self):
+        registry_directory = self._getPlaywrightRegistryDirectory()
+        if not os.path.exists(registry_directory):
+            return
+
+        # TODO: Seems useless use of os.scandir, our helper for listing a directory
+        # would be better to use.
+        browsers_installed = [
+            browser
+            for browser in os.scandir(registry_directory)
+            if browser.name != ".links"
+        ]
+        self.installed_browsers = {}
+        for browser in browsers_installed:
+            self.installed_browsers[browser.name] = browser
+
+    def considerDataFiles(self, module):
+
+        if module.getFullName() != "playwright":
+            return
+
+        if not self.include_browsers:
+
+            self.sysexit(
+                "No browsers included. Use the option '--playwright-include-browser=browser_name' to include one. Use 'all' to include all installed ones."  # pylint: disable=C0301
+            )
+
+        self.getInstalledPlaywrightBrowsers()
+
+        if not self.installed_browsers:
+            self.sysexit(
+                "Error, no browsers found in the registry, if you're using playwright, make sure to install a browser."
+            )
+
+        self.info("Including browsers: %s" % ", ".join(self.include_browsers))
+        if "all" in self.include_browsers:
+            self.include_browsers = self.installed_browsers
+        elif "ffmpeg" not in self.include_browsers and any(
+            browser.startswith("chrom") for browser in self.include_browsers
+        ):
+            for browser in self.installed_browsers:
+                if "ffmpeg" in self.installed_browsers[browser].name:
+                    self.include_browsers.append(browser)
+                    self.info(
+                        "Including 'ffmpeg' for chromium-based browser. It is required by playwright."
+                    )
+                    break
+
+        for browser in self.include_browsers:
+            if browser not in self.installed_browsers:
+                msg = (
+                    "Error, requested to include browser '%s' that was not found, the list of installed ones is '%s'."
+                    % (
+                        browser,
+                        ", ".join(self.installed_browsers),
+                    )
+                )
+                self.sysexit(msg)
+
+            msg = "Including '%s' from '%s'." % (
+                browser,
+                self.installed_browsers[browser].path,
+            )
+            self.info(msg)
+
+            yield self.makeIncludedDataDirectory(
+                source_path=self.installed_browsers[browser],
+                dest_path=os.path.join(
+                    "playwright", "driver", "package", ".local-browsers", browser
+                ),
+                reason="Playwright browser '%s'" % browser,
+                tags="playwright",
+                raw=True,
+            )
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/plugins/standard/PySidePyQtPlugin.py

@@ -72,6 +72,14 @@ class NuitkaPluginQtBindingsPluginBase(NuitkaPluginBase):
         if "sensible" in include_qt_plugins:
             include_qt_plugins.remove("sensible")
 
+        for include_qt_plugin in include_qt_plugins:
+            if include_qt_plugin not in ("qml", "all") and not self.hasPluginFamily(
+                include_qt_plugin
+            ):
+                self.sysexit(
+                    "Error, there is no Qt plugin family '%s'." % include_qt_plugin
+                )
+
         self.qt_plugins = sensible_qt_plugins
         self.qt_plugins.update(include_qt_plugins)
 

nuitka/plugins/standard/TkinterPlugin.py

@@ -11,7 +11,6 @@ from nuitka.Options import isStandaloneMode, shallCreateAppBundle
 from nuitka.plugins.PluginBase import NuitkaPluginBase
 from nuitka.PythonFlavors import isHomebrewPython
 from nuitka.PythonVersions import getSystemPrefixPath, getTkInterVersion
-from nuitka.utils.FileOperations import listDllFilesFromDirectory, relpath
 from nuitka.utils.Utils import isMacOS, isWin32Windows
 
 # spell-checker: ignore tkinterdnd,tkdnd,tcltk
@@ -135,34 +134,6 @@ override it here. Default is automatic detection.""",
 The Tcl library dir. See comments for Tk library dir.""",
         )
 
-    @staticmethod
-    def _getTkinterDnDPlatformDirectory():
-        # From their code:
-        import platform
-
-        if platform.system() == "Darwin":
-            return "osx64"
-        elif platform.system() == "Linux":
-            return "linux64"
-        elif platform.system() == "Windows":
-            return "win64"
-        else:
-            return None
-
-    def _considerDataFilesTkinterDnD(self, module):
-        platform_rep = self._getTkinterDnDPlatformDirectory()
-
-        if platform_rep is None:
-            return
-
-        yield self.makeIncludedPackageDataFiles(
-            package_name="tkinterdnd2",
-            package_directory=module.getCompileTimeDirectory(),
-            pattern=os.path.join("tkdnd", platform_rep, "**"),
-            reason="Tcl needed for 'tkinterdnd2' usage",
-            tags="tcl",
-        )
-
     def _getTclCandidatePaths(self):
         # Check typical locations of the dirs
         yield os.getenv("TCL_LIBRARY")
@@ -234,12 +205,6 @@ The Tcl library dir. See comments for Tk library dir.""",
             IncludedDataFile objects.
         """
 
-        # Extra TCL providing module go here:
-        if module.getFullName() == "tkinterdnd2.TkinterDnD":
-            yield self._considerDataFilesTkinterDnD(module)
-
-            return
-
         if not _isTkInterModule(module) or self.files_copied:
             return
 
@@ -301,27 +266,6 @@ that works, report a bug."""
 
         self.files_copied = True
 
-    def getExtraDlls(self, module):
-        if module.getFullName() == "tkinterdnd2.TkinterDnD":
-            platform_rep = self._getTkinterDnDPlatformDirectory()
-
-            if platform_rep is None:
-                return
-
-            module_directory = module.getCompileTimeDirectory()
-
-            for filename, _dll_filename in listDllFilesFromDirectory(
-                os.path.join(module_directory, "tkdnd", platform_rep)
-            ):
-                dest_path = relpath(filename, module_directory)
-                yield self.makeDllEntryPoint(
-                    source_path=filename,
-                    dest_path=os.path.join("tkinterdnd2", dest_path),
-                    module_name="tkinterdnd2",
-                    package_name="tkinterdnd2",
-                    reason="tkinterdnd2 package DLL",
-                )
-
     def onModuleCompleteSet(self, module_set):
         if str is bytes:
             plugin_binding_name = "Tkinter"