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

nuitka/tools/testing/Common.py

@@ -41,7 +41,7 @@ from nuitka.utils.FileOperations import (
 )
 from nuitka.utils.InstalledPythons import findInstalledPython
 from nuitka.utils.Jinja2 import getTemplate
-from nuitka.utils.Utils import getOS, isMacOS, isWin32Windows
+from nuitka.utils.Utils import isFreeBSD, isLinux, isMacOS, isWin32Windows
 
 from .SearchModes import (
     SearchModeByPattern,
@@ -205,7 +205,7 @@ def getTempDir():
                 os.path.dirname(os.path.abspath(sys.modules["__main__"].__file__))
             )
             + "-",
-            dir=tempfile.gettempdir() if not os.path.exists("/var/tmp") else "/var/tmp",
+            dir=None if not (isLinux() and os.path.exists("/var/tmp")) else "/var/tmp",
         )
 
         def removeTempDir():
@@ -520,7 +520,7 @@ def displayRuntimeTraces(logger, path):
 
     if os.name == "posix":
         # Run with traces to help debugging, specifically in CI environment.
-        if getOS() in ("Darwin", "FreeBSD"):
+        if isMacOS() or isFreeBSD():
             test_logger.info("dtruss:")
             os.system("sudo dtruss %s" % path)
         else:
@@ -731,6 +731,7 @@ def checkReferenceCount(checked_function, max_rounds=20, explain=False):
 
 def createSearchMode():
     # Dealing with many options, pylint: disable=too-many-branches
+    # Return driven, pylint: disable=too-many-return-statements
 
     parser = OptionParser()
 
@@ -804,7 +805,9 @@ Defaults to off.""",
         else:
             return SearchModeImmediate()
     elif mode == "resume":
-        return SearchModeResume(sys.modules["__main__"].__file__)
+        return SearchModeResume(sys.modules["__main__"].__file__, skip=False)
+    elif mode == "skip":
+        return SearchModeResume(sys.modules["__main__"].__file__, skip=True)
     elif mode == "only":
         if options.pattern:
             pattern = options.pattern.replace("/", os.path.sep)
@@ -1882,7 +1885,11 @@ def getLocalWebServerDir(base_dir):
     web_dir = os.path.join(getTempDir(), "local-web-server", base_dir)
 
     if _web_server_process is None:
-        web_server_directory_supporting_pythons = ("3.11", "3.10", "3.9", "3.8", "3.7")
+        web_server_directory_supporting_pythons = tuple(
+            python_version
+            for python_version in getTestExecutionPythonVersions()
+            if python_version not in ("3.6", "3.5", "3.4", "2.7", "2.6")
+        )
 
         web_server_python = findInstalledPython(
             python_versions=web_server_directory_supporting_pythons,

nuitka/tools/testing/SearchModes.py

@@ -109,7 +109,7 @@ class SearchModeByPattern(SearchModeBase):
 
 
 class SearchModeResume(SearchModeBase):
-    def __init__(self, tests_path):
+    def __init__(self, tests_path, skip):
         SearchModeBase.__init__(self)
 
         tests_path = os.path.normcase(os.path.abspath(tests_path))
@@ -134,6 +134,7 @@ class SearchModeResume(SearchModeBase):
             self.resume_from = None
 
         self.active = not self.resume_from
+        self.skip = skip
 
     def consider(self, dirname, filename):
         parts = [dirname, filename]
@@ -152,6 +153,9 @@ class SearchModeResume(SearchModeBase):
         if areSamePaths(path, self.resume_from):
             self.active = True
 
+            if self.skip:
+                return False
+
         return self.active
 
     def finish(self):

nuitka/tools/testing/run_nuitka_tests/__main__.py

@@ -241,6 +241,16 @@ The standard CPython3.11 test suite. Execute this for all corner cases to be
 covered. With Python 2.x these are not run. Default is %default.""",
     )
 
+    parser.add_option(
+        "--skip-cpython312-tests",
+        action="store_false",
+        dest="cpython312",
+        default=True,
+        help="""\
+The standard CPython3.12 test suite. Execute this for all corner cases to be
+covered. With Python 2.x these are not run. Default is %default.""",
+    )
+
     parser.add_option(
         "--skip-other-cpython-tests",
         action="store_true",
@@ -370,6 +380,15 @@ Do not use Python3.10 even if available on the system. Default is %default.""",
 Do not use Python3.11 even if available on the system. Default is %default.""",
     )
 
+    parser.add_option(
+        "--no-python3.12",
+        action="store_true",
+        dest="no312",
+        default=False,
+        help="""\
+Do not use Python3.12 even if available on the system. Default is %default.""",
+    )
+
     parser.add_option(
         "--coverage",
         action="store_true",
@@ -436,6 +455,8 @@ Enforce the use of MinGW64 on Windows. Defaults to off.""",
             options.no310 = True
         if sys.version_info[0:2] != (3, 11):
             options.no311 = True
+        if sys.version_info[0:2] != (3, 12):
+            options.no312 = True
 
     if options.cpython_no_other:
         if sys.version_info[0:2] != (2, 6):
@@ -460,6 +481,8 @@ Enforce the use of MinGW64 on Windows. Defaults to off.""",
             options.cpython310 = False
         if sys.version_info[0:2] != (3, 11):
             options.cpython311 = False
+        if sys.version_info[0:2] != (3, 12):
+            options.cpython312 = False
 
     if options.cpython_none:
         options.cpython26 = False
@@ -473,6 +496,7 @@ Enforce the use of MinGW64 on Windows. Defaults to off.""",
         options.cpython39 = False
         options.cpython310 = False
         options.cpython311 = False
+        options.cpython312 = False
 
     if options.coverage and os.path.exists(".coverage"):
         os.unlink(".coverage")
@@ -580,6 +604,8 @@ def main():
             return False
         if command == "python3.11" and options.no311:
             return False
+        if command == "python3.12" and options.no312:
+            return False
 
         # Shortcuts for python versions, also needed for Windows as it won't have
         # the version number in the Python binaries at all.
@@ -911,6 +937,17 @@ def main():
                     else:
                         my_print("The CPython3.11 tests are not present, not run.")
 
+            # Running the Python 3.12 test suite only with CPython3.x.
+            if not use_python.startswith("python2"):
+                if options.cpython312:
+                    if os.path.exists("./tests/CPython312/run_all.py"):
+                        with withExtendedExtraOptions(
+                            *getExtraFlags(where, "312tests", flags)
+                        ):
+                            executeSubTest("./tests/CPython312/run_all.py search")
+                    else:
+                        my_print("The CPython3.12 tests are not present, not run.")
+
     if not any(
         checkExecutableCommand("python%s" % python_version)
         for python_version in getTestExecutionPythonVersions()

nuitka/tools/watch/GitHub.py

@@ -6,11 +6,7 @@
 import os
 import sys
 
-from nuitka.tools.quality.Git import (
-    getCurrentBranchName,
-    getModifiedPaths,
-    getRemoteURL,
-)
+from nuitka.tools.quality.Git import getModifiedPaths, getRemoteURL
 from nuitka.Tracing import tools_logger
 from nuitka.utils.Execution import callProcess, check_call
 
@@ -21,8 +17,6 @@ def checkInNuitkaWatch():
         "git@github.com:Nuitka/Nuitka-Watch.git",
         "https://github.com/Nuitka/Nuitka-Watch",
     ), remote_url
-    branch_name = getCurrentBranchName()
-    assert branch_name == "main", branch_name
     assert os.path.exists(".git")
 
 

nuitka/tree/Building.py

@@ -131,6 +131,7 @@ from nuitka.Tracing import (
 )
 from nuitka.utils import MemoryUsage
 from nuitka.utils.ModuleNames import ModuleName
+from nuitka.utils.Utils import withNoSyntaxWarning
 
 from . import SyntaxErrors
 from .ReformulationAssertStatements import buildAssertNode
@@ -1074,6 +1075,7 @@ def _createModule(
     if module_kind == "extension":
         result = PythonExtensionModule(
             module_name=module_name,
+            module_filename=module_filename,
             reason=reason,
             technical=is_stdlib and module_name in detectEarlyImports(),
             source_ref=source_ref,
@@ -1366,12 +1368,13 @@ def buildModule(
                 )
 
         try:
-            ast_tree = parseSourceCodeToAst(
-                source_code=source_code,
-                module_name=module_name,
-                filename=source_filename,
-                line_offset=0,
-            )
+            with withNoSyntaxWarning():
+                ast_tree = parseSourceCodeToAst(
+                    source_code=source_code,
+                    module_name=module_name,
+                    filename=source_filename,
+                    line_offset=0,
+                )
         except (SyntaxError, IndentationError) as e:
             # Do not hide SyntaxError if asked not to.
             if not hide_syntax_error:

nuitka/tree/ReformulationMatchStatements.py

@@ -14,16 +14,18 @@ from nuitka.nodes.AttributeNodes import (
     ExpressionAttributeCheck,
     makeExpressionAttributeLookup,
 )
+from nuitka.nodes.BuiltinDictNodes import ExpressionBuiltinDict
 from nuitka.nodes.BuiltinLenNodes import ExpressionBuiltinLen
 from nuitka.nodes.BuiltinTypeNodes import ExpressionBuiltinList
 from nuitka.nodes.ComparisonNodes import makeComparisonExpression
 from nuitka.nodes.ConditionalNodes import makeStatementConditional
 from nuitka.nodes.ConstantRefNodes import makeConstantRefNode
+from nuitka.nodes.DictionaryNodes import StatementDictOperationRemove
 from nuitka.nodes.MatchNodes import ExpressionMatchArgs
 from nuitka.nodes.OutlineNodes import ExpressionOutlineBody
 from nuitka.nodes.ReturnNodes import makeStatementReturnConstant
 from nuitka.nodes.SubscriptNodes import (
-    ExpressionSubscriptCheck,
+    ExpressionMatchSubscriptCheck,
     ExpressionSubscriptLookup,
 )
 from nuitka.nodes.TypeMatchNodes import (
@@ -32,7 +34,10 @@ from nuitka.nodes.TypeMatchNodes import (
 )
 from nuitka.nodes.TypeNodes import ExpressionBuiltinIsinstance
 from nuitka.nodes.VariableAssignNodes import makeStatementAssignmentVariable
-from nuitka.nodes.VariableNameNodes import StatementAssignmentVariableName
+from nuitka.nodes.VariableNameNodes import (
+    ExpressionVariableNameRef,
+    StatementAssignmentVariableName,
+)
 from nuitka.nodes.VariableRefNodes import ExpressionTempVariableRef
 from nuitka.nodes.VariableReleaseNodes import makeStatementReleaseVariable
 
@@ -156,17 +161,18 @@ def _buildMatchSequence(provider, pattern, make_against, source_ref):
     # Could special case ">=1" or "==0" with truth checks potentially, but that
     # is for generic optimization to recognize, we don't know much about the
     # matched value at this point yet.
-    conditions.append(
-        makeComparisonExpression(
-            left=ExpressionBuiltinLen(
-                value=make_against(),
+    if min_length > 0 or exact:
+        conditions.append(
+            makeComparisonExpression(
+                left=ExpressionBuiltinLen(
+                    value=make_against(),
+                    source_ref=source_ref,
+                ),
+                right=makeConstantRefNode(constant=min_length, source_ref=source_ref),
+                comparator="Eq" if exact else "GtE",
                 source_ref=source_ref,
-            ),
-            right=makeConstantRefNode(constant=min_length, source_ref=source_ref),
-            comparator="Eq" if exact else "GtE",
-            source_ref=source_ref,
+            )
         )
-    )
 
     star_pos = None
 
@@ -190,8 +196,8 @@ def _buildMatchSequence(provider, pattern, make_against, source_ref):
                 assert "!" not in variable_name, variable_name
 
                 # Last one
-                if star_pos == len(pattern.patterns):
-                    slice_value = slice(count)
+                if star_pos == len(pattern.patterns) - 1:
+                    slice_value = slice(star_pos, None)
                 else:
                     slice_value = slice(count, -(len(pattern.patterns) - (count + 1)))
 
@@ -252,7 +258,7 @@ def _buildMatchMapping(provider, pattern, make_against, source_ref):
 
     for key, kwd_pattern in zip(pattern.keys, pattern.patterns):
         conditions.append(
-            ExpressionSubscriptCheck(
+            ExpressionMatchSubscriptCheck(
                 expression=make_against(),
                 subscript=buildNode(provider, key, source_ref),
                 source_ref=source_ref,
@@ -277,6 +283,37 @@ def _buildMatchMapping(provider, pattern, make_against, source_ref):
         if item_assignments:
             assignments.extend(item_assignments)
 
+    if pattern.rest:
+        assert type(pattern.rest) is str, pattern.rest
+
+        assignments.append(
+            StatementAssignmentVariableName(
+                provider=provider,
+                variable_name=pattern.rest,
+                source=ExpressionBuiltinDict(
+                    pos_arg=make_against(),
+                    pairs=(),
+                    source_ref=source_ref,
+                ),
+                source_ref=source_ref,
+            )
+        )
+
+        for key in pattern.keys:
+            assert type(key) is ast.Constant, key
+
+            assignments.append(
+                StatementDictOperationRemove(
+                    dict_arg=ExpressionVariableNameRef(
+                        provider=provider,
+                        variable_name=pattern.rest,
+                        source_ref=source_ref,
+                    ),
+                    key=buildNode(provider, key, source_ref),
+                    source_ref=source_ref,
+                )
+            )
+
     return conditions, assignments
 
 

nuitka/tree/TreeHelpers.py

@@ -62,6 +62,9 @@ def extractDocFromBody(node):
         if Options.hasPythonFlagNoDocStrings():
             doc = None
 
+    if doc is not None and python_version >= 0x3D0:
+        doc = doc.lstrip()
+
     return body, doc
 
 
@@ -291,6 +294,8 @@ def setBuildingDispatchers(path_args3, path_args2, path_args1):
 
 
 def buildNode(provider, node, source_ref, allow_none=False):
+    # too many exception handlers, pylint: disable=too-many-branches
+
     if node is None and allow_none:
         return None
 
@@ -330,6 +335,9 @@ def buildNode(provider, node, source_ref, allow_none=False):
         # we got interrupted.
         optimization_logger.info("Interrupted at '%s'." % source_ref)
         raise
+    except SystemExit:
+        optimization_logger.warning("Problem at '%s'." % source_ref.getAsString())
+        raise
     except:
         optimization_logger.warning(
             "Problem at '%s' with %s." % (source_ref.getAsString(), ast.dump(node))

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

@@ -12,8 +12,10 @@ spell-checker: ignore execl, Popen
 import os
 import sys
 
+from nuitka.Options import shallExecuteImmediately
 
-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 +35,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 +48,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)
@@ -79,6 +85,9 @@ def reExecuteNuitka(pgo_filename):
     else:
         os.environ["NUITKA_SYS_PREFIX"] = sys.prefix
 
+    if shallExecuteImmediately():
+        args.append("--run")
+
     # Same arguments as before.
     args += sys.argv[1:]
 
@@ -120,7 +129,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"):
@@ -644,7 +661,15 @@ def copyDllFile(source_path, dist_dir, dest_path, executable):
         # Path must be normalized for this to be correct, but entry points enforced that.
         count = dest_path.count(os.path.sep)
 
-        rpath = os.path.join("$ORIGIN", *([".."] * count))
+        # TODO: This ought to depend on actual presence of used DLLs with middle
+        # paths and not just do it, but maybe there is not much harm in it.
+        if count > 0:
+            rpath = ":".join(
+                os.path.join("$ORIGIN", *([".."] * c)) for c in range(count, 0, -1)
+            )
+        else:
+            rpath = "$ORIGIN"
+
         setSharedLibraryRPATH(target_filename, rpath)
 
     if isWin32Windows() and isUnstripped():

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()