Nuitka-winsvc 2.4.11__cp311-cp311-win_amd64.whl → 2.5.6__cp311-cp311-win_amd64.whl

nuitka/utils/Importing.py

@@ -12,6 +12,7 @@ import sys
 from nuitka.PythonVersions import python_version
 from nuitka.Tracing import general
 
+from .InlineCopies import getInlineCopyFolder
 from .ModuleNames import ModuleName
 from .Utils import withNoDeprecationWarning
 
@@ -156,20 +157,7 @@ _deleted_modules = {}
 def importFromInlineCopy(module_name, must_exist, delete_module=False):
     """Import a module from the inline copy stage."""
 
-    folder_name = os.path.normpath(
-        os.path.join(
-            os.path.dirname(__file__), "..", "build", "inline_copy", module_name
-        )
-    )
-
-    candidate_27 = folder_name + "_27"
-    candidate_35 = folder_name + "_35"
-
-    # Use specific versions if needed.
-    if python_version < 0x300 and os.path.exists(candidate_27):
-        folder_name = candidate_27
-    elif python_version < 0x360 and os.path.exists(candidate_35):
-        folder_name = candidate_35
+    folder_name = getInlineCopyFolder(module_name)
 
     module = _importFromFolder(
         module_name=module_name,

nuitka/utils/InlineCopies.py

@@ -0,0 +1,52 @@
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Policies for locating inline copies."""
+
+import os
+
+from nuitka.PythonVersions import python_version
+
+
+def _getInlineCopyBaseFolder():
+    """Base folder for inline copies."""
+    return os.path.normpath(
+        os.path.join(os.path.dirname(__file__), "..", "build", "inline_copy")
+    )
+
+
+def getInlineCopyFolder(module_name):
+    """Get the inline copy folder for a given name."""
+    folder_name = os.path.join(_getInlineCopyBaseFolder(), module_name)
+
+    candidate_27 = folder_name + "_27"
+    candidate_35 = folder_name + "_35"
+
+    # Use specific versions if needed.
+    if python_version < 0x300 and os.path.exists(candidate_27):
+        folder_name = candidate_27
+    elif python_version < 0x360 and os.path.exists(candidate_35):
+        folder_name = candidate_35
+
+    return folder_name
+
+
+def getDownloadCopyFolder():
+    """Get the inline copy folder for a given name."""
+    return os.path.join(_getInlineCopyBaseFolder(), "downloads", "pip")
+
+
+#     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/utils/InstalledPythons.py

@@ -195,10 +195,15 @@ def findPythons(python_version, module_name=None, module_version=None):
         _installed_pythons[python_version] = result
 
     return tuple(
-        candidate
-        for candidate in _installed_pythons[python_version]
-        if candidate.checkUsability(
-            module_name=module_name, module_version=module_version
+        sorted(
+            (
+                candidate
+                for candidate in _installed_pythons[python_version]
+                if candidate.checkUsability(
+                    module_name=module_name, module_version=module_version
+                )
+            ),
+            key=lambda c: c.getPythonExe(),
         )
     )
 

nuitka/utils/Json.py

@@ -19,9 +19,9 @@ def loadJsonFromFilename(filename):
         return None
 
 
-def writeJsonToFilename(filename, contents):
+def writeJsonToFilename(filename, contents, indent=2):
     with openTextFile(filename, "w") as output:
-        json.dump(contents, output)
+        json.dump(contents, output, indent=indent)
 
 
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and

nuitka/utils/PackageResources.py

@@ -0,0 +1,44 @@
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
+""" Access package data. """
+
+import os
+import pkgutil
+
+from nuitka.importing.Importing import locateModule
+
+from .FileOperations import getFileContents
+
+
+def getPackageData(package_name, resource):
+    """Get the package data, but without loading the code, i.e. we try and avoids its loader.
+
+    If it's absolutely necessary, we fallback to "pkgutil.get_data" but
+    only if we absolutely cannot find it easily.
+    """
+    package_directory = locateModule(package_name, None, 0)[1]
+
+    if package_directory is not None:
+        resource_filename = os.path.join(package_directory, resource)
+
+        if os.path.exists(resource_filename):
+            return getFileContents(resource_filename, mode="rb")
+
+    return pkgutil.get_data(package_name, resource)
+
+
+#     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/utils/SharedLibraries.py

@@ -258,6 +258,29 @@ def _getMacOSArchOption():
         return ()
 
 
+# TODO: Use this for more output filters.
+def _filterOutputByLine(output, filter_func):
+    non_errors = []
+
+    for line in output.splitlines():
+        if line and not filter_func(line):
+            non_errors.append(line)
+
+    output = b"\n".join(non_errors)
+
+    return (0 if non_errors else None), output
+
+
+def _filterOtoolErrorOutput(stderr):
+    def isNonErrorExit(line):
+        if b"missing from root that overrides" in line:
+            return True
+
+        return False
+
+    return _filterOutputByLine(stderr, isNonErrorExit)
+
+
 def _getOToolCommandOutput(otool_option, filename):
     filename = os.path.abspath(filename)
 
@@ -272,6 +295,7 @@ def _getOToolCommandOutput(otool_option, filename):
         _otool_output_cache[cache_key] = executeToolChecked(
             logger=postprocessing_logger,
             command=command,
+            stderr_filter=_filterOtoolErrorOutput,
             absence_message="The 'otool' is used to analyze dependencies on macOS and required to be found.",
         )
 

nuitka/utils/Signing.py

@@ -6,6 +6,7 @@
 """
 
 from nuitka.Options import (
+    getMacOSSignedAppName,
     getMacOSSigningIdentity,
     shallUseSigningForNotarization,
 )
@@ -104,9 +105,16 @@ def addMacOSCodeSignature(filenames):
         "--force",
         "--deep",
         "--preserve-metadata=entitlements",
-        # ,
     ]
 
+    macos_signed_app_name = getMacOSSignedAppName()
+
+    if macos_signed_app_name is not None:
+        command += [
+            "-i",
+            macos_signed_app_name,
+        ]
+
     if shallUseSigningForNotarization():
         command.append("--options=runtime")
 

nuitka/utils/Utils.py

@@ -324,6 +324,7 @@ def encodeNonAscii(var_name):
     else:
         # Using a escaping here, because that makes it safe in terms of not
         # to occur in the encoding escape sequence for unicode use.
+        # spell-checker: ignore xmlcharrefreplace
         var_name = var_name.replace("$$", "$_$")
 
         var_name = var_name.encode("ascii", "xmlcharrefreplace")