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

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
@@ -27,17 +28,10 @@ from nuitka.__past__ import (  # pylint: disable=redefined-builtin
     FileNotFoundError,
     PermissionError,
     basestring,
-    raw_input,
     unicode,
 )
 from nuitka.PythonVersions import python_version
-from nuitka.Tracing import (
-    flushStandardOutputs,
-    general,
-    my_print,
-    options_logger,
-    printLine,
-)
+from nuitka.Tracing import general, my_print, options_logger, queryUser
 
 from .Importing import importFromInlineCopy
 from .ThreadedExecutor import RLock, getThreadIdent
@@ -101,8 +95,8 @@ def areSamePaths(path1, path2):
     if path1 == path2:
         return True
 
-    path1 = os.path.abspath(os.path.normpath(path1))
-    path2 = os.path.abspath(os.path.normpath(path2))
+    path1 = os.path.abspath(getNormalizedPath(path1))
+    path2 = os.path.abspath(getNormalizedPath(path2))
 
     if os.path.exists(path1) and os.path.exists(path2):
         path1 = getExternalUsePath(path1)
@@ -446,7 +440,7 @@ def getFileList(
             fullname = os.path.join(root, filename)
 
             if normalize:
-                fullname = os.path.normpath(fullname)
+                fullname = getNormalizedPath(fullname)
 
             result.append(fullname)
 
@@ -787,19 +781,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 +804,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 +826,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 >= 0x370:
+        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):
@@ -1027,33 +1017,6 @@ def copyFileWithPermissions(source_path, dest_path, dist_dir):
         os.chmod(dest_path, source_mode)
 
 
-def queryUser(question, choices, default, default_non_interactive):
-    assert default in choices, (default, choices)
-    assert default_non_interactive in choices, (default, choices)
-
-    prompt = "%s? %s : " % (
-        question,
-        "/".join(
-            "[%s]" % choice.title() if choice == default else choice.title()
-            for choice in choices
-        ),
-    )
-
-    # Integrates with progress bar by closing it.
-    printLine(prompt, end="")
-    flushStandardOutputs()
-
-    try:
-        reply = raw_input() or default
-    except EOFError:
-        reply = default_non_interactive
-
-    if reply == "y":
-        reply = "yes"
-
-    return reply.lower()
-
-
 def copyFile(source_path, dest_path):
     """Improved version of shutil.copy
 
@@ -1205,7 +1168,7 @@ def getWindowsLongPathName(filename):
     while True:
         output_buf = ctypes.create_unicode_buffer(output_buf_size)
         needed = GetLongPathNameW(
-            os.path.abspath(filename), output_buf, output_buf_size
+            getNormalizedPath(os.path.abspath(filename)), output_buf, output_buf_size
         )
 
         if needed == 0:
@@ -1475,6 +1438,16 @@ def isFilesystemEncodable(filename):
         return True
 
 
+def makeFilesystemEncodable(filename):
+    if not os.path.isabs(filename):
+        filename = os.path.abspath(filename)
+
+    if not isFilesystemEncodable(filename):
+        filename = getExternalUsePath(filename)
+
+    return filename
+
+
 def openPickleFile(filename, mode, protocol=-1):
     file_handle = openTextFile(filename, mode)
 
@@ -1533,6 +1506,18 @@ def getParentDirectories(path):
         yield path
 
 
+def getNormalizedPath(path):
+    """Return normalized path that is also a native path, i.e. only legal characters.
+
+    Needed, because MSYS2 likes to keep "/" in normalized paths.
+    """
+    path = os.path.normpath(path)
+    if isWin32Windows():
+        path = path.replace("/", "\\")
+
+    return path
+
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #

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/Utils.py

@@ -128,6 +128,22 @@ def getWindowsRelease():
     if not isWin32OrPosixWindows():
         return None
 
+    if isPosixWindows():
+        from .FileOperations import getFileContents
+
+        build_number = int(
+            getFileContents("/proc/version").split(" ")[0].rsplit("-")[-1]
+        )
+
+        if build_number >= 21996:
+            return 11
+        elif build_number >= 10240:
+            return 10
+        elif build_number >= 9200:
+            return 8
+        else:
+            return 7
+
     class OsVersionInfoEx(ctypes.Structure):
         _fields_ = [
             ("dwOSVersionInfoSize", ctypes.c_ulong),
@@ -308,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")