Nuitka-winsvc 2.4.10__tar.gz → 2.4.11__tar.gz

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/Nuitka_winsvc.egg-info/PKG-INFO

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

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/PKG-INFO

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

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/doc/nuitka-run.1

@@ -184,7 +184,7 @@ There are many allowed forms. With '\-\-include\-datafiles=/path/to/file/*.txt=f
 will copy a single file and complain if it's multiple.
 With '\-\-include\-datafiles=/path/to/files/*.txt=folder_name/' it will put
 all matching files into that folder. For recursive
-copy there is a form with 3 values that '\-\-includedata\-files=/path/to/scan=folder_name=**/*.txt' that
+copy there is a form with 3 values that '\-\-includedata\-files=/path/to/scan=folder_name/=**/*.txt' that
 will preserve directory structure. Default empty.
 .TP
 \fB\-\-include\-data\-dir\fR=\fI\,DIRECTORY\/\fR

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/doc/nuitka.1

@@ -184,7 +184,7 @@ There are many allowed forms. With '\-\-include\-datafiles=/path/to/file/*.txt=f
 will copy a single file and complain if it's multiple.
 With '\-\-include\-datafiles=/path/to/files/*.txt=folder_name/' it will put
 all matching files into that folder. For recursive
-copy there is a form with 3 values that '\-\-includedata\-files=/path/to/scan=folder_name=**/*.txt' that
+copy there is a form with 3 values that '\-\-includedata\-files=/path/to/scan=folder_name/=**/*.txt' that
 will preserve directory structure. Default empty.
 .TP
 \fB\-\-include\-data\-dir\fR=\fI\,DIRECTORY\/\fR

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/nuitka/OptionParsing.py

@@ -401,7 +401,7 @@ allowed forms. With '--include-data-files=/path/to/file/*.txt=folder_name/some.t
 will copy a single file and complain if it's multiple. With
 '--include-data-files=/path/to/files/*.txt=folder_name/' it will put
 all matching files into that folder. For recursive copy there is a
-form with 3 values that '--include-data-files=/path/to/scan=folder_name=**/*.txt'
+form with 3 values that '--include-data-files=/path/to/scan=folder_name/=**/*.txt'
 that will preserve directory structure. Default empty.""",
 )
 

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/nuitka/Version.py

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

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/nuitka/build/SconsCaching.py

@@ -279,7 +279,11 @@ def _getCcacheStatistics(ccache_logfile):
         # can be matched against it.
         commands = {}
 
-        for line in getFileContentByLine(ccache_logfile):
+        # Due to upstream issues, lines in the log might have different encodings.
+        # All command and result lines use the platform's default encoding,
+        # so we follow this to ensure these lines are correct.
+        # Unrecognized characters are replaced by byte values, e.g. "\xde\xad"
+        for line in getFileContentByLine(ccache_logfile, errors="backslashreplace"):
             match = re_command.match(line)
 
             if match:
@@ -313,7 +317,9 @@ def _getCcacheStatistics(ccache_logfile):
 
                     all_text = []
 
-                    for line2 in getFileContentByLine(ccache_logfile):
+                    for line2 in getFileContentByLine(
+                        ccache_logfile, errors="backslashreplace"
+                    ):
                         match = re_anything.match(line2)
 
                         if match:

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/nuitka/build/SconsCompilerSettings.py

@@ -379,9 +379,9 @@ For Python version %s MSVC %s or later is required, not %s which is too old."""
                         % (compiler_path,)
                     )
 
-                # This also will trigger using it to use our own gcc in branch below.
-                compiler_path = None
-                env["CC"] = None
+                    # This also will trigger using it to use our own gcc in branch below.
+                    compiler_path = None
+                    env["CC"] = None
 
         if compiler_path is None and msvc_version is None:
             scons_details_logger.info(

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/nuitka/freezer/IncludedDataFiles.py

@@ -539,7 +539,7 @@ def _reportDataFiles():
 
 
 def _checkPathConflict(dest_path, standalone_entry_points):
-    assert os.path.normpath(dest_path) == dest_path
+    assert getNormalizedPath(dest_path) == dest_path
 
     while dest_path:
         for standalone_entry_point in standalone_entry_points:

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/nuitka/freezer/IncludedEntryPoints.py

@@ -17,6 +17,7 @@ from nuitka.Options import getShallNotIncludeDllFilePatterns, isShowInclusion
 from nuitka.Tracing import general, inclusion_logger
 from nuitka.utils.FileOperations import (
     areSamePaths,
+    getNormalizedPath,
     getReportPath,
     hasFilenameExtension,
     haveSameFileContents,
@@ -51,7 +52,7 @@ def _makeIncludedEntryPoint(
     assert type(executable) is bool, executable
 
     # Make sure outside code uses sane paths only.
-    assert source_path == os.path.normpath(source_path), source_path
+    assert source_path == getNormalizedPath(source_path), source_path
 
     # Avoid obvious mistakes, these files won't be binaries or DLL ever, right?
     assert not hasFilenameExtension(path=source_path, extensions=(".qml", ".json"))
@@ -60,7 +61,7 @@ def _makeIncludedEntryPoint(
         logger=logger,
         kind=kind,
         source_path=source_path,
-        dest_path=os.path.normpath(dest_path),
+        dest_path=getNormalizedPath(dest_path),
         module_name=module_name,
         package_name=package_name,
         executable=executable,

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/nuitka/importing/Recursion.py

@@ -345,6 +345,14 @@ def _addIncludedModule(module, package_only):
                         module_package=module.getFullName(),
                         package_only=False,
                     )
+                else:
+                    for suffix in getSharedLibrarySuffixes():
+                        if sub_path.endswith(suffix):
+                            checkPluginSinglePath(
+                                sub_path,
+                                module_package=module.getFullName(),
+                                package_only=False,
+                            )
 
     elif module.isCompiledPythonModule() or module.isUncompiledPythonModule():
         ModuleRegistry.addRootModule(module)

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/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"

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/nuitka/plugins/standard/standard.nuitka-package.config.yml

@@ -1748,6 +1748,11 @@
         'from torch.utils.cpp_extension import _get_build_directory, load': ''
       when: 'not use_setuptools'
 
+- module-name: 'gssapi.raw' # checksum: f8e7301e
+  implicit-imports:
+    - depends:
+        - 'gssapi.raw._enum_extensions.*'
+
 - module-name: 'gtk._gtk' # checksum: 4fb4a03b
   implicit-imports:
     - depends:
@@ -2122,13 +2127,16 @@
     - depends:
         - 'kivy.graphics.compiler'
 
-- module-name: 'kivymd' # checksum: 1fda13e6
+- module-name: 'kivymd' # checksum: b3f15565
   data-files:
     - dirs:
         - 'fonts'
         - 'images'
         - 'data'
         - 'uix'
+  implicit-imports:
+    - depends:
+        - 'kivymd.icon_definitions'
 
 - module-name: 'kiwisolver' # checksum: a0fc11a6
   dlls:
@@ -4426,7 +4434,7 @@
     - find-dlls-near-module:
         - 'shiboken2'
 
-- module-name: 'PySide6' # checksum: 219aba79
+- module-name: 'PySide6' # checksum: 27df3ea2
   implicit-imports:
     - post-import-code:
         - |
@@ -4482,6 +4490,9 @@
         - 'libqsqlodbc'
         - 'libpq.5'
         - 'libffmpegmediaplugin'
+        - 'libqtquickcontrols2fluentwinui3styleimplplugin'
+        - 'libqtquickcontrols2fluentwinui3styleplugin'
+        - 'libqtwebviewquickplugin'
 
 - module-name: 'PySide6.QtCore' # checksum: be0d99ac
   implicit-imports:
@@ -5072,6 +5083,14 @@
         executable: 'yes'
       when: 'win32'
 
+- module-name: 'selenium_driverless' # checksum: bdcb049
+  data-files:
+    - dirs:
+        - '.'
+  implicit-imports:
+    - depends:
+        - 'websockets.legacy.*'
+
 - module-name: 'selenium_stealth' # checksum: 26b9c88c
   data-files:
     - dirs:
@@ -6957,6 +6976,91 @@
           - 'libextrafont'
       when: 'win32'
 
+- module-name: 'tkinterdnd2.TkinterDnD' # checksum: 401c1500
+  data-files:
+    - dirs:
+        - 'tkdnd/win64'
+      when: 'use_tkinter and win32 and version("tkinterdnd2") < (0,4)'
+    - dirs:
+        - 'tkdnd/linux64'
+      when: 'use_tkinter and linux and version("tkinterdnd2") < (0,4)'
+    - dirs:
+        - 'tkdnd/osx64'
+      when: 'use_tkinter and macos and version("tkinterdnd2") < (0,4)'
+    - dirs:
+        - 'tkdnd/win-arm64'
+      when: 'use_tkinter and win32 and arch_arm64 and version("tkinterdnd2") >= (0,4)'
+    - dirs:
+        - 'tkdnd/win-x64'
+      when: 'use_tkinter and win32 and arch_amd64 and version("tkinterdnd2") >= (0,4)'
+    - dirs:
+        - 'tkdnd/win-x86'
+      when: 'use_tkinter and win32 and arch_x86 and version("tkinterdnd2") >= (0,4)'
+    - dirs:
+        - 'tkdnd/linux-arm64'
+      when: 'use_tkinter and linux and arch_arm64 and version("tkinterdnd2") >= (0,4)'
+    - dirs:
+        - 'tkdnd/linux-x64'
+      when: 'use_tkinter and linux and arch_amd64 and version("tkinterdnd2") >= (0,4)'
+    - dirs:
+        - 'tkdnd/osx-arm64'
+      when: 'use_tkinter and macos and arch_arm64 and version("tkinterdnd2") >= (0,4)'
+    - dirs:
+        - 'tkdnd/osx-x64'
+      when: 'use_tkinter and macos and arch_amd64 and version("tkinterdnd2") >= (0,4)'
+  dlls:
+    - from_filenames:
+        relative_path: 'tkdnd/win64'
+        prefixes:
+          - ''
+      when: 'use_tkinter and win32 and version("tkinterdnd2") < (0,4)'
+    - from_filenames:
+        relative_path: 'tkdnd/linux64'
+        prefixes:
+          - ''
+      when: 'use_tkinter and linux and version("tkinterdnd2") < (0,4)'
+    - from_filenames:
+        relative_path: 'tkdnd/osx64'
+        prefixes:
+          - ''
+      when: 'use_tkinter and macos and version("tkinterdnd2") < (0,4)'
+
+    - from_filenames:
+        relative_path: 'tkdnd/win-arm64'
+        prefixes:
+          - ''
+      when: 'use_tkinter and win32 and arch_arm64 and version("tkinterdnd2") >= (0,4)'
+    - from_filenames:
+        relative_path: 'tkdnd/win-x64'
+        prefixes:
+          - ''
+      when: 'use_tkinter and win32 and arch_amd64 and version("tkinterdnd2") >= (0,4)'
+    - from_filenames:
+        relative_path: 'tkdnd/win-x86'
+        prefixes:
+          - ''
+      when: 'use_tkinter and win32 and arch_x86 and version("tkinterdnd2") >= (0,4)'
+    - from_filenames:
+        relative_path: 'tkdnd/linux-arm64'
+        prefixes:
+          - ''
+      when: 'use_tkinter and linux and arch_arm64 and version("tkinterdnd2") >= (0,4)'
+    - from_filenames:
+        relative_path: 'tkdnd/linux-x64'
+        prefixes:
+          - ''
+      when: 'use_tkinter and linux and arch_amd64 and version("tkinterdnd2") >= (0,4)'
+    - from_filenames:
+        relative_path: 'tkdnd/osx-arm64'
+        prefixes:
+          - ''
+      when: 'use_tkinter and macos and arch_arm64 and version("tkinterdnd2") >= (0,4)'
+    - from_filenames:
+        relative_path: 'tkdnd/osx-x64'
+        prefixes:
+          - ''
+      when: 'use_tkinter and macos and arch_amd64 and version("tkinterdnd2") >= (0,4)'
+
 - module-name: 'tkinterweb' # checksum: 5de6ded8
   data-files:
     - dirs:

{nuitka_winsvc-2.4.10 → nuitka_winsvc-2.4.11}/nuitka/utils/FileOperations.py

@@ -10,6 +10,7 @@ stuff. It will also frequently add sorting for determinism.
 
 from __future__ import print_function
 
+import codecs
 import errno
 import fnmatch
 import glob
@@ -787,19 +788,22 @@ def withTemporaryFile(suffix="", mode="w", delete=True, temp_path=None):
         yield temp_file
 
 
-def getFileContentByLine(filename, mode="r", encoding=None):
+def getFileContentByLine(filename, mode="r", encoding=None, errors=None):
     # We read the whole, to keep lock times minimal. We only deal with small
     # files like this normally.
-    return getFileContents(filename, mode, encoding=encoding).splitlines()
+    return getFileContents(
+        filename, mode, encoding=encoding, errors=errors
+    ).splitlines()
 
 
-def getFileContents(filename, mode="r", encoding=None):
+def getFileContents(filename, mode="r", encoding=None, errors=None):
     """Get the contents of a file.
 
     Args:
         filename: str with the file to be read
         mode: "r" for str, "rb" for bytes result
         encoding: optional encoding to used when reading the file, e.g. "utf8"
+        errors: optional error handler decoding the content, as defined in `codecs`
 
     Returns:
         str or bytes - depending on mode.
@@ -807,7 +811,7 @@ def getFileContents(filename, mode="r", encoding=None):
     """
 
     with withFileLock("reading file %s" % filename):
-        with openTextFile(filename, mode, encoding=encoding) as f:
+        with openTextFile(filename, mode, encoding=encoding, errors=errors) as f:
             return f.read()
 
 
@@ -829,18 +833,11 @@ def getFileFirstLine(filename, mode="r", encoding=None):
             return f.readline()
 
 
-def openTextFile(filename, mode, encoding=None):
-    if encoding is not None:
-        import codecs
-
-        return codecs.open(filename, mode, encoding=encoding)
-    else:
-        # Avoid deprecation warning, is now the default.
-        if python_version >= 0x370:
-            mode = mode.replace("U", "")
+def openTextFile(filename, mode, encoding=None, errors=None):
+    if python_version >= 0x3B0:
+        mode = mode.replace("U", "")
 
-        # Encoding was checked to be not needed.
-        return open(filename, mode)  # pylint: disable=unspecified-encoding
+    return codecs.open(filename, mode, encoding=encoding, errors=errors)
 
 
 def putTextFileContents(filename, contents, encoding=None):