Nuitka-winsvc 2.2.3__cp311-cp311-win_amd64.whl → 2.3__cp311-cp311-win_amd64.whl

nuitka/utils/CStrings.py

@@ -63,16 +63,23 @@ def encodePythonUnicodeToC(value):
     assert type(value) is unicode, type(value)
 
     result = ""
+    last_was_hex = False
 
     for c in value:
         cv = ord(c)
 
         if c == "\\":
             result += "\\\\"
+            last_was_hex = False
         elif 34 < cv < 128:
+            if last_was_hex:
+                result += '" L"'
+
             result += c
+            last_was_hex = False
         else:
             result += r"\x%04x" % cv
+            last_was_hex = True
 
     return 'L"%s"' % result
 

nuitka/utils/Execution.py

@@ -421,8 +421,17 @@ def createProcess(
 
 
 def executeProcess(
-    command, env=None, stdin=False, shell=False, external_cwd=False, timeout=None
+    command,
+    env=None,
+    stdin=False,
+    shell=False,
+    external_cwd=False,
+    timeout=None,
+    logger=None,
 ):
+    if logger is not None:
+        logger.info("Executing command '%s'." % " ".join(command), keep_format=True)
+
     process = createProcess(
         command=command, env=env, stdin=stdin, shell=shell, external_cwd=external_cwd
     )

nuitka/utils/FileOperations.py

@@ -730,23 +730,31 @@ def removeDirectory(path, ignore_errors):
     """
 
     def onError(func, path, exc_info):
-        # Try again immediately, ignore what happened, pylint: disable=unused-argument
-        try:
-            func(path)
-        except OSError:
-            time.sleep(0.1)
-
-        func(path)
+        # Record what happened what happened, pylint: disable=unused-argument
+        last_error.append(func, path)
 
     with withFileLock("removing directory %s" % path):
         if os.path.exists(path):
-            try:
+            previous_error = []
+
+            while True:
+                last_error = []
                 shutil.rmtree(path, ignore_errors=False, onerror=onError)
-            except OSError:
-                if ignore_errors:
+
+                # onError as a side effect, modifies last_error
+                if previous_error == last_error:
+                    break
+
+                previous_error = list(last_error)
+                time.sleep(0.1)
+
+            # if it still exists, try one more time, this time not ignoring errors.
+            if os.path.exists(path):
+                try:
                     shutil.rmtree(path, ignore_errors=ignore_errors)
-                else:
-                    raise
+                except OSError:
+                    if not ignore_errors:
+                        raise
 
 
 def resetDirectory(path, ignore_errors):
@@ -1438,7 +1446,7 @@ def syncFileOutput(file_handle):
 
 def isFilesystemEncodable(filename):
     """Decide if a filename is safe for use as a file system path with tools."""
-    if os.name == "nt":
+    if os.name == "nt" and type(filename) is unicode:
         value = (
             unicodedata.normalize("NFKD", filename)
             .encode("ascii", "ignore")

nuitka/utils/Importing.py

@@ -307,6 +307,30 @@ def getModuleNameAndKindFromFilenameSuffix(module_filename):
     return None, None
 
 
+def hasPackageDirFilename(path):
+    path = os.path.basename(path)
+
+    for suffix in (".py",) + getSharedLibrarySuffixes():
+        candidate = "__init__" + suffix
+
+        if candidate == path:
+            return True
+
+    return False
+
+
+def getPackageDirFilename(path):
+    assert os.path.isdir(path)
+
+    for suffix in (".py",) + getSharedLibrarySuffixes():
+        candidate = os.path.join(path, "__init__" + suffix)
+
+        if os.path.isfile(candidate):
+            return candidate
+
+    return None
+
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #

nuitka/utils/ReExecute.py

@@ -13,7 +13,7 @@ import os
 import sys
 
 
-def callExecProcess(args):
+def callExecProcess(args, uac):
     """Do exec in a portable way preserving exit code.
 
     On Windows, unfortunately there is no real exec, so we have to spawn
@@ -33,7 +33,7 @@ def callExecProcess(args):
 
         try:
             # Context manager is not available on all Python versions, pylint: disable=consider-using-with
-            process = subprocess.Popen(args=args)
+            process = subprocess.Popen(args=args, shell=uac)
             process.communicate()
             # No point in cleaning up, just exit the hard way.
             try:
@@ -46,6 +46,10 @@ def callExecProcess(args):
             # There was a more relevant stack trace already, so abort this
             # right here.
             os._exit(2)
+        except OSError as e:
+            print("Error, executing: %s" % e)
+            os._exit(2)
+
     else:
         # The star arguments is the API of execl
         os.execl(*args)
@@ -120,7 +124,7 @@ def reExecuteNuitka(pgo_filename):
     os.environ["NUITKA_REEXECUTION"] = "1"
 
     # Does not return:
-    callExecProcess(args)
+    callExecProcess(args, uac=False)
 
 
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and

nuitka/utils/SharedLibraries.py

@@ -364,6 +364,23 @@ Error, needs 'patchelf' on your system, to modify 'RPATH' settings that \
 need to be updated."""
 
 
+def checkPatchElfPresenceAndUsability(logger):
+    """Checks if patchelf is present and usable."""
+
+    output = executeToolChecked(
+        logger=logger,
+        command=("patchelf", "--version"),
+        absence_message="""\
+Error, standalone mode on Linux requires 'patchelf' to be \
+installed. Use 'apt/dnf/yum install patchelf' first.""",
+    )
+
+    if output.split() == b"0.18.0":
+        logger.sysexit(
+            "Error, patchelf version 0.18.0 is a known buggy release and cannot be used. Please upgrade or downgrade it."
+        )
+
+
 def _setSharedLibraryRPATHElf(filename, rpath):
     # patchelf --set-rpath "$ORIGIN/path/to/library" <executable>
     with withEnvironmentVarOverridden("LANG", "C"):

nuitka/utils/Yaml.py

@@ -38,7 +38,15 @@ class PackageConfigYaml(object):
 
         assert type(file_data) is bytes
         data = parseYaml(file_data)
-        assert type(data) is list
+
+        if not data:
+            general.sysexit(
+                """\
+Error, empty (or malformed?) user package configuration '%s' used."""
+                % name
+            )
+
+        assert type(data) is list, type(data)
 
         self.data = OrderedDict()