Nuitka-winsvc 2.5.1__tar.gz → 2.5.6__tar.gz

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/Nuitka_winsvc.egg-info/PKG-INFO

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

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/Nuitka_winsvc.egg-info/SOURCES.txt

@@ -1159,6 +1159,7 @@ nuitka/nodes/YieldNodes.py
 nuitka/nodes/__init__.py
 nuitka/nodes/shapes/BuiltinTypeShapes.py
 nuitka/nodes/shapes/ControlFlowDescriptions.py
+nuitka/nodes/shapes/IteratorShapes.py
 nuitka/nodes/shapes/ShapeMixins.py
 nuitka/nodes/shapes/StandardShapes.py
 nuitka/nodes/shapes/__init__.py

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/PKG-INFO

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

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/doc/nuitka-run.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH NUITKA-RUN "1" "2024" "nuitka-run 2.5" "User Commands"
+.TH NUITKA-RUN "1" "2024" "nuitka-run 2.6" "User Commands"
 .SH NAME
 nuitka-run \- the Python compiler
 .SH SYNOPSIS
@@ -22,7 +22,8 @@ executable instead of a program. Defaults to off.
 Mode in which to compile. Accelerated runs in your
 Python installation and depends on it. Standalone
 creates a folder with an executable contained to run
-it. Onefile creates a single executable to deploy.
+it. Onefile creates a single executable to deploy. App
+is onefile except on macOS where it's not to be used.
 Default is 'accelerated'.
 .TP
 \fB\-\-standalone\fR
@@ -301,7 +302,7 @@ messages which are not really incompatible, but only
 different or worse. This is intended for tests only
 and should *not* be used.
 .TP
-\fB\-\-file\-reference\-choice\fR=\fI\,MODE\/\fR
+\fB\-\-file\-reference\-choice\fR=\fI\,FILE_MODE\/\fR
 Select what value "__file__" is going to be. With
 "runtime" (default for standalone binary mode and
 module mode), the created binaries and modules, use
@@ -316,7 +317,7 @@ module_name>" is used. For compatibility reasons, the
 "__file__" value will always have ".py" suffix
 independent of what it really is.
 .TP
-\fB\-\-module\-name\-choice\fR=\fI\,MODE\/\fR
+\fB\-\-module\-name\-choice\fR=\fI\,MODULE_NAME_MODE\/\fR
 Select what value "__name__" and "__package__" are
 going to be. With "runtime" (default for module mode),
 the created module uses the parent package to deduce
@@ -686,7 +687,7 @@ will potentially grant protected API accesses.
 Name of the product to use in macOS bundle
 information. Defaults to base filename of the binary.
 .TP
-\fB\-\-macos\-app\-mode\fR=\fI\,MODE\/\fR
+\fB\-\-macos\-app\-mode\fR=\fI\,APP_MODE\/\fR
 Mode of application for the application bundle. When
 launching a Window, and appearing in Docker is
 desired, default value "gui" is a good fit. Without a

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/doc/nuitka.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.3.
-.TH NUITKA "1" "2024" "nuitka 2.5" "User Commands"
+.TH NUITKA "1" "2024" "nuitka 2.6" "User Commands"
 .SH NAME
 nuitka \- the Python compiler
 .SH SYNOPSIS
@@ -22,7 +22,8 @@ executable instead of a program. Defaults to off.
 Mode in which to compile. Accelerated runs in your
 Python installation and depends on it. Standalone
 creates a folder with an executable contained to run
-it. Onefile creates a single executable to deploy.
+it. Onefile creates a single executable to deploy. App
+is onefile except on macOS where it's not to be used.
 Default is 'accelerated'.
 .TP
 \fB\-\-standalone\fR
@@ -301,7 +302,7 @@ messages which are not really incompatible, but only
 different or worse. This is intended for tests only
 and should *not* be used.
 .TP
-\fB\-\-file\-reference\-choice\fR=\fI\,MODE\/\fR
+\fB\-\-file\-reference\-choice\fR=\fI\,FILE_MODE\/\fR
 Select what value "__file__" is going to be. With
 "runtime" (default for standalone binary mode and
 module mode), the created binaries and modules, use
@@ -316,7 +317,7 @@ module_name>" is used. For compatibility reasons, the
 "__file__" value will always have ".py" suffix
 independent of what it really is.
 .TP
-\fB\-\-module\-name\-choice\fR=\fI\,MODE\/\fR
+\fB\-\-module\-name\-choice\fR=\fI\,MODULE_NAME_MODE\/\fR
 Select what value "__name__" and "__package__" are
 going to be. With "runtime" (default for module mode),
 the created module uses the parent package to deduce
@@ -686,7 +687,7 @@ will potentially grant protected API accesses.
 Name of the product to use in macOS bundle
 information. Defaults to base filename of the binary.
 .TP
-\fB\-\-macos\-app\-mode\fR=\fI\,MODE\/\fR
+\fB\-\-macos\-app\-mode\fR=\fI\,APP_MODE\/\fR
 Mode of application for the application bundle. When
 launching a Window, and appearing in Docker is
 desired, default value "gui" is a good fit. Without a

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/OptionParsing.py

@@ -74,13 +74,14 @@ parser.add_option(
     action="store",
     dest="compilation_mode",
     metavar="COMPILATION_MODE",
-    choices=("onefile", "standalone", "accelerated", "module"),
+    choices=("app", "onefile", "standalone", "accelerated", "module"),
     default=None,
     help="""\
 Mode in which to compile. Accelerated runs in your Python
 installation and depends on it. Standalone creates a folder
 with an executable contained to run it. Onefile creates a
-single executable to deploy. Default is 'accelerated'.""",
+single executable to deploy. App is onefile except on macOS
+where it's not to be used. Default is 'accelerated'.""",
 )
 
 parser.add_option(
@@ -641,7 +642,7 @@ compilation_group.add_option(
     "--file-reference-choice",
     action="store",
     dest="file_reference_mode",
-    metavar="MODE",
+    metavar="FILE_MODE",
     choices=("original", "runtime", "frozen"),
     default=None,
     help="""\
@@ -660,7 +661,7 @@ compilation_group.add_option(
     "--module-name-choice",
     action="store",
     dest="module_name_mode",
-    metavar="MODE",
+    metavar="MODULE_NAME_MODE",
     choices=("original", "runtime"),
     default=None,
     help="""\
@@ -1622,7 +1623,7 @@ macos_group.add_option(
     "--macos-app-mode",
     action="store",
     dest="macos_app_mode",
-    metavar="MODE",
+    metavar="APP_MODE",
     choices=("gui", "background", "ui-element"),
     default="gui",
     help="""\

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/Options.py

@@ -57,6 +57,7 @@ from nuitka.PythonVersions import (
 from nuitka.utils.Execution import getExecutablePath
 from nuitka.utils.FileOperations import (
     getNormalizedPath,
+    getReportPath,
     isLegalPath,
     isPathExecutable,
     openTextFile,
@@ -296,15 +297,13 @@ it with e.g. '{TEMP}', '{CACHE_DIR}' is recommended: '%s'"""
 
 
 def _getVersionInformationValues():
-    # TODO: Might be nice if we could delay version information computation
-    # until it's actually used.
     yield getNuitkaVersion()
     yield "Commercial: %s" % getCommercialVersion()
     yield "Python: %s" % sys.version.split("\n", 1)[0]
     yield "Flavor: %s" % getPythonFlavorName()
     if python_version >= 0x3D0:
         yield "GIL: %s" % ("yes" if isPythonWithGil() else "no")
-    yield "Executable: %s" % sys.executable
+    yield "Executable: %s" % getReportPath(sys.executable)
     yield "OS: %s" % getOS()
     yield "Arch: %s" % getArchitecture()
 
@@ -494,7 +493,12 @@ Error, the Python from Windows app store is not supported.""",
     Tracing.progress_logger.is_quiet = not options.show_progress
 
     if options.compilation_mode is not None:
-        if options.is_onefile or options.is_standalone or options.module_mode:
+        if (
+            options.is_onefile
+            or options.is_standalone
+            or options.module_mode
+            or options.macos_create_bundle
+        ):
             Tracing.options_logger.sysexit(
                 "Cannot use both '--mode=' and deprecated options that specify mode."
             )
@@ -505,6 +509,11 @@ Error, the Python from Windows app store is not supported.""",
             options.is_standalone = True
         elif options.compilation_mode == "module":
             options.module_mode = True
+        elif options.compilation_mode == "app":
+            if isMacOS():
+                options.macos_create_bundle = True
+            else:
+                options.is_onefile = True
 
     # Onefile implies standalone build.
     if options.is_onefile:
@@ -1557,7 +1566,7 @@ def getOutputFilename():
 def getOutputPath(path):
     """Return output pathname of a given path (filename)."""
     if options.output_dir:
-        return os.path.normpath(os.path.join(options.output_dir, path))
+        return getNormalizedPath(os.path.join(options.output_dir, path))
     else:
         return path
 

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/Version.py

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

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/SconsInterface.py

@@ -472,6 +472,8 @@ def setCommonSconsOptions(options):
 
     options["debug_modes"] = ",".join(Options.getDebugModeIndications())
 
+    options["deployment"] = asBoolStr(Options.isDeploymentMode())
+
     options["no_deployment"] = ",".join(Options.getNoDeploymentIndications())
 
     if Options.shallRunInDebugger():

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/include/nuitka/constants.h

@@ -143,6 +143,8 @@ extern PyObject **global_constants;
 #define const_str_plain_isfile global_constants[42]
 // 'listdir'
 #define const_str_plain_listdir global_constants[42]
+// 'lstat'
+#define const_str_plain_lstat global_constants[42]
 // 'stat'
 #define const_str_plain_stat global_constants[42]
 // 'basename'

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/include/nuitka/helper/dictionaries.h

@@ -197,9 +197,17 @@ static Nuitka_DictEntryHandle GET_STRING_DICT_ENTRY(PyDictObject *dict, Nuitka_S
     }
 
 #else
-    // Will be written by Nuitka_PyDictLookupStr in all cases.
     PyObject **value;
-    NUITKA_MAY_BE_UNUSED Py_ssize_t found = Nuitka_PyDictLookupStr(dict, (PyObject *)key, hash, &value);
+    NUITKA_MAY_BE_UNUSED Py_ssize_t found;
+
+    // We cannot use Nuitka_PyDictLookupStr in all cases, some modules misbehave
+    // and put non-strings in module dictionaries.
+    if (unlikely(dict->ma_keys->dk_kind == DICT_KEYS_GENERAL)) {
+        found = Nuitka_PyDictLookup(dict, (PyObject *)key, hash, &value);
+    } else {
+        found = Nuitka_PyDictLookupStr(dict, (PyObject *)key, hash, &value);
+    }
+
     assert(found != DKIX_ERROR);
 
     return value;

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/include/nuitka/helper/tuples.h

@@ -34,6 +34,7 @@ extern PyObject *MAKE_TUPLE_EMPTY_VAR(PyThreadState *tstate, Py_ssize_t size);
 #endif
 
 NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE(PyThreadState *tstate, PyObject *const *elements, Py_ssize_t size) {
+    assert(size > 0);
     PyObject *result = MAKE_TUPLE_EMPTY(tstate, size);
 
     for (Py_ssize_t i = 0; i < size; i++) {
@@ -43,6 +44,17 @@ NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE(PyThreadState *tstate, PyObject
     return result;
 }
 
+NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE_VAR(PyThreadState *tstate, PyObject *const *elements,
+                                                     Py_ssize_t size) {
+    PyObject *result = MAKE_TUPLE_EMPTY_VAR(tstate, size);
+
+    for (Py_ssize_t i = 0; i < size; i++) {
+        PyTuple_SET_ITEM0(result, i, elements[i]);
+    }
+
+    return result;
+}
+
 NUITKA_MAY_BE_UNUSED static PyObject *MAKE_TUPLE1(PyThreadState *tstate, PyObject *element1) {
     PyObject *result = MAKE_TUPLE_EMPTY(tstate, 1);
 

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/include/nuitka/prelude.h

@@ -195,6 +195,7 @@ NUITKA_MAY_BE_UNUSED static inline managed_static_type_state *Nuitka_PyStaticTyp
 #include <internal/pycore_intrinsics.h>
 #include <internal/pycore_modsupport.h>
 #include <internal/pycore_parking_lot.h>
+#include <internal/pycore_pyatomic_ft_wrappers.h>
 #include <internal/pycore_setobject.h>
 #include <internal/pycore_time.h>
 #endif

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/static_src/CompiledCodeHelpers.c

@@ -1629,6 +1629,7 @@ wchar_t const *getBinaryDirectoryWideChars(bool resolve_symlinks) {
 
         stripFilenameW(binary_directory);
 
+#ifndef _NUITKA_EXPERIMENTAL_AVOID_SHORT_PATH
         // Query length of result first.
         DWORD length = GetShortPathNameW(binary_directory, NULL, 0);
         assert(length != 0);
@@ -1645,6 +1646,7 @@ wchar_t const *getBinaryDirectoryWideChars(bool resolve_symlinks) {
         appendWStringSafeW(binary_directory, short_binary_directory, sizeof(binary_directory) / sizeof(wchar_t));
 
         free(short_binary_directory);
+#endif
 #else
         appendStringSafeW(binary_directory, getBinaryDirectoryHostEncoded(true),
                           sizeof(binary_directory) / sizeof(wchar_t));

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/static_src/CompiledCoroutineType.c

@@ -1402,7 +1402,7 @@ static PyObject *computeCoroutineOrigin(PyThreadState *tstate, int origin_depth)
         frame_count += 1;
     }
 
-    PyObject *cr_origin = MAKE_TUPLE_EMPTY(tstate, frame_count);
+    PyObject *cr_origin = MAKE_TUPLE_EMPTY_VAR(tstate, frame_count);
 
     frame = PyEval_GetFrame();
 

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/static_src/CompiledGeneratorTypeUncompiledIntegration.c

@@ -148,12 +148,15 @@ static void SET_CURRENT_EXCEPTION_GENERATOR_EXIT(PyThreadState *tstate) {
 
 #if PYTHON_VERSION >= 0x300
 static bool Nuitka_PyGen_FetchStopIterationValue(PyThreadState *tstate, PyObject **pvalue) {
-    assert(HAS_ERROR_OCCURRED(tstate));
-
 #if PYTHON_VERSION < 0x3c0
-    PyObject *value = NULL;
+    if (!HAS_ERROR_OCCURRED(tstate)) {
+        *pvalue = Py_None;
+        Py_INCREF_IMMORTAL(Py_None);
+
+        return true;
+    } else if (EXCEPTION_MATCH_BOOL_SINGLE(tstate, tstate->curexc_type, PyExc_StopIteration)) {
+        PyObject *value = NULL;
 
-    if (EXCEPTION_MATCH_BOOL_SINGLE(tstate, tstate->curexc_type, PyExc_StopIteration)) {
         PyObject *exception_type, *exception_value;
         PyTracebackObject *exception_tb;
 
@@ -185,38 +188,44 @@ static bool Nuitka_PyGen_FetchStopIterationValue(PyThreadState *tstate, PyObject
 
         Py_XDECREF(exception_type);
         Py_XDECREF(exception_tb);
-    } else if (HAS_ERROR_OCCURRED(tstate)) {
-        return false;
-    }
 
-    if (value == NULL) {
-        value = Py_None;
-        Py_INCREF(value);
-    }
+        if (value == NULL) {
+            value = Py_None;
+            Py_INCREF(value);
+        }
 
-    *pvalue = value;
+        *pvalue = value;
 
-    return true;
+        return true;
+    } else {
+        return false;
+    }
 #else
-    PyObject *value = NULL;
+    if (!HAS_ERROR_OCCURRED(tstate)) {
+        *pvalue = Py_None;
+        Py_INCREF_IMMORTAL(Py_None);
+
+        return true;
+    } else if (EXCEPTION_MATCH_BOOL_SINGLE(tstate, tstate->current_exception, PyExc_StopIteration)) {
+        PyObject *value = NULL;
 
-    if (EXCEPTION_MATCH_BOOL_SINGLE(tstate, tstate->current_exception, PyExc_StopIteration)) {
         PyObject *exc = tstate->current_exception;
         tstate->current_exception = NULL;
 
         value = Py_NewRef(((PyStopIterationObject *)exc)->value);
         Py_DECREF(exc);
-    } else if (HAS_ERROR_OCCURRED(tstate)) {
-        return false;
-    }
 
-    if (value == NULL) {
-        value = Py_None;
-    }
+        if (value == NULL) {
+            value = Py_None;
+        }
+
+        *pvalue = value;
 
-    *pvalue = value;
+        return true;
 
-    return true;
+    } else {
+        return false;
+    }
 #endif
 }
 #endif

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/static_src/HelpersBuiltin.c

@@ -48,7 +48,7 @@ PyObject *CALL_BUILTIN_KW_ARGS(PyThreadState *tstate, PyObject *callable, PyObje
         i++;
     }
 
-    PyObject *args_tuple = MAKE_TUPLE(tstate, args, usable_args);
+    PyObject *args_tuple = MAKE_TUPLE_VAR(tstate, args, usable_args);
 
     PyObject *result = CALL_FUNCTION(tstate, callable, args_tuple, kw_dict);
     Py_XDECREF(kw_dict);

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/static_src/HelpersDeepcopy.c

@@ -594,6 +594,7 @@ static PyObject *_DEEP_COPY_TUPLE_GUIDED(PyThreadState *tstate, PyObject *value,
     Py_ssize_t size = PyTuple_GET_SIZE(value);
 
     // We cannot have size 0, so this is safe.
+    assert(size > 0);
     PyObject *result = MAKE_TUPLE_EMPTY(tstate, size);
 
     for (Py_ssize_t i = 0; i < size; i++) {

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/static_src/HelpersDictionaries.c

@@ -1015,9 +1015,14 @@ void DICT_CLEAR(PyObject *dict) {
 #if PYTHON_VERSION >= 0x3b0
 static inline int Nuitka_py_get_index_from_order(PyDictObject *mp, Py_ssize_t i) {
     assert(mp->ma_used <= SHARED_KEYS_MAX_SIZE);
+#if PYTHON_VERSION < 0x3d0
     assert(i < (((char *)mp->ma_values)[-2]));
-
     return ((char *)mp->ma_values)[-3 - i];
+#else
+    assert(i < mp->ma_values->size);
+    uint8_t *array = get_insertion_order_array(mp->ma_values);
+    return array[i];
+#endif
 }
 #endif
 
@@ -1049,7 +1054,14 @@ static inline Py_ssize_t Nuitka_Py_dictkeys_get_index(const PyDictKeysObject *ke
     return ix;
 }
 
-static inline Py_hash_t Nuitka_Py_unicode_get_hash(PyObject *o) { return _PyASCIIObject_CAST(o)->hash; }
+static inline Py_hash_t Nuitka_Py_unicode_get_hash(PyObject *o) {
+#if PYTHON_VERSION < 0x3d0
+    return _PyASCIIObject_CAST(o)->hash;
+#else
+    assert(PyUnicode_CheckExact(o));
+    return FT_ATOMIC_LOAD_SSIZE_RELAXED(_PyASCIIObject_CAST(o)->hash);
+#endif
+}
 
 // From CPython
 #define PERTURB_SHIFT 5

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/static_src/HelpersDictionariesGenerated.c

@@ -75,7 +75,11 @@ PyObject *DICT_COPY(PyThreadState *tstate, PyObject *dict_value) {
             assert(result_mp != NULL);
             result = (PyObject *)result_mp;
 
+#if PYTHON_VERSION < 0x3b0
             Py_ssize_t size = DK_ENTRIES_SIZE(dict_mp->ma_keys);
+#else
+            Py_ssize_t size = dict_mp->ma_keys->dk_nentries + dict_mp->ma_keys->dk_usable;
+#endif
 
             PyDictValues *new_values = _Nuitka_PyDict_new_values(size);
             assert(new_values != NULL);
@@ -289,7 +293,11 @@ PyObject *DEEP_COPY_DICT(PyThreadState *tstate, PyObject *dict_value) {
             assert(result_mp != NULL);
             result = (PyObject *)result_mp;
 
+#if PYTHON_VERSION < 0x3b0
             Py_ssize_t size = DK_ENTRIES_SIZE(dict_mp->ma_keys);
+#else
+            Py_ssize_t size = dict_mp->ma_keys->dk_nentries + dict_mp->ma_keys->dk_usable;
+#endif
 
             PyDictValues *new_values = _Nuitka_PyDict_new_values(size);
             assert(new_values != NULL);
@@ -514,8 +522,11 @@ static PyObject *COPY_DICT_KW(PyThreadState *tstate, PyObject *dict_value) {
             assert(result_mp != NULL);
             result = (PyObject *)result_mp;
 
+#if PYTHON_VERSION < 0x3b0
             Py_ssize_t size = DK_ENTRIES_SIZE(dict_mp->ma_keys);
-
+#else
+            Py_ssize_t size = dict_mp->ma_keys->dk_nentries + dict_mp->ma_keys->dk_usable;
+#endif
 #if PYTHON_VERSION < 0x3b0
             for (Py_ssize_t i = 0; i < size; i++) {
                 PyDictKeyEntry *entry = &DK_ENTRIES(dict_mp->ma_keys)[i];

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/static_src/HelpersFiles.c

@@ -246,7 +246,7 @@ extern PyObject *OS_LSTAT(PyThreadState *tstate, PyObject *path, PyObject *dir_f
 
     assert(path != NULL);
     assert(dir_fd == NULL);
-    PyObject *stat_func = LOOKUP_ATTRIBUTE(tstate, IMPORT_HARD_OS(), const_str_plain_stat);
+    PyObject *stat_func = LOOKUP_ATTRIBUTE(tstate, IMPORT_HARD_OS(), const_str_plain_lstat);
 
     result = CALL_FUNCTION_WITH_SINGLE_ARG(tstate, stat_func, path);
 

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/static_src/HelpersTuples.c

@@ -117,7 +117,7 @@ PyObject *TUPLE_COPY(PyThreadState *tstate, PyObject *tuple) {
     assert(PyTuple_CheckExact(tuple));
 
     Py_ssize_t size = PyTuple_GET_SIZE(tuple);
-    PyObject *result = MAKE_TUPLE_EMPTY(tstate, size);
+    PyObject *result = MAKE_TUPLE_EMPTY_VAR(tstate, size);
 
     if (unlikely(result == NULL)) {
         return NULL;

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/build/static_src/MainProgram.c

@@ -16,6 +16,10 @@
 #include <windows.h>
 #endif
 
+#if defined(__APPLE__)
+#include <unistd.h>
+#endif
+
 #include "nuitka/prelude.h"
 
 #ifndef __IDE_ONLY__
@@ -1219,6 +1223,19 @@ int main(int argc, char **argv) {
     inheritAttachedConsole();
 #endif
 
+#ifdef _NUITKA_MACOS_BUNDLE
+    {
+        char *current_dir = getcwd(NULL, -1);
+
+        if (strcmp(current_dir, "/") == 0) {
+            chdir(getBinaryDirectoryHostEncoded(false));
+            chdir("../../../");
+        }
+
+        free(current_dir);
+    }
+#endif
+
     // Set up stdout/stderr according to user specification.
 #if NUITKA_STANDARD_HANDLES_EARLY == 1
 #if defined(NUITKA_FORCED_STDOUT_PATH)
@@ -1334,15 +1351,19 @@ int main(int argc, char **argv) {
     /* Initial command line handling only. */
 
 // Make sure, we use the absolute program path for argv[0]
-#if !defined(_NUITKA_ONEFILE_MODE) && _NUITKA_NATIVE_WCHAR_ARGV == 0
+#if _NUITKA_NATIVE_WCHAR_ARGV == 0
     original_argv0 = argv[0];
+#if !defined(_NUITKA_ONEFILE_MODE)
     argv[0] = (char *)getBinaryFilenameHostEncoded(false);
 #endif
+#endif
 
 #if defined(_NUITKA_ONEFILE_MODE)
     {
         environment_char_t const *parent_original_argv0 = getEnvironmentVariable("NUITKA_ORIGINAL_ARGV0");
 
+        // If forked from the parent process, it's set, otherwise fall back
+        // to standalone executable binary name as set above.
         if (parent_original_argv0 != NULL) {
             original_argv0 = strdupFilename(parent_original_argv0);
 
@@ -1362,9 +1383,9 @@ orig_argv = argv;
 #endif
 
 // Make sure, we use the absolute program path for argv[0]
-#if !defined(_NUITKA_ONEFILE_MODE) && _NUITKA_NATIVE_WCHAR_ARGV == 1
+#if _NUITKA_NATIVE_WCHAR_ARGV == 1
     original_argv0 = argv[0];
-#if PYTHON_VERSION >= 0x300
+#if PYTHON_VERSION >= 0x300 && !defined(_NUITKA_ONEFILE_MODE)
     orig_argv[0] = (wchar_t *)getBinaryFilenameWideChars(false);
 #endif
 #endif

{nuitka_winsvc-2.5.1 → nuitka_winsvc-2.5.6}/nuitka/code_generation/templates/CodeTemplatesVariables.py

@@ -313,41 +313,44 @@ static PyObject *%(accessor_function_name)s(PyThreadState *tstate) {
     static Py_ssize_t cache_dk_index = 0;
 
     PyDictKeysObject *dk = moduledict_%(module_identifier)s->ma_keys;
-    assert(DK_IS_UNICODE(dk));
+    if (likely(DK_IS_UNICODE(dk))) {
 
 #if PYTHON_VERSION >= 0x3c0
-    uint32_t current_dk_version = _Nuitka_PyDictKeys_GetVersionForCurrentState(tstate->interp, dk);
+        uint32_t current_dk_version = _Nuitka_PyDictKeys_GetVersionForCurrentState(tstate->interp, dk);
 #else
-    uint32_t current_dk_version = _Nuitka_PyDictKeys_GetVersionForCurrentState(dk);
+        uint32_t current_dk_version = _Nuitka_PyDictKeys_GetVersionForCurrentState(dk);
 #endif
 
-    if (current_dk_version != dict_keys_version) {
-        dict_keys_version = current_dk_version;
-        Py_hash_t hash = ((Nuitka_StringObject *)%(var_name)s)->_base._base.hash;
-        assert(hash != -1);
+        if (current_dk_version != dict_keys_version) {
+            dict_keys_version = current_dk_version;
+            Py_hash_t hash = ((Nuitka_StringObject *)%(var_name)s)->_base._base.hash;
+            assert(hash != -1);
 
-        cache_dk_index = Nuitka_Py_unicodekeys_lookup_unicode(dk, %(var_name)s, hash);
-    }
+            cache_dk_index = Nuitka_Py_unicodekeys_lookup_unicode(dk, %(var_name)s, hash);
+        }
 
-    if (cache_dk_index >= 0) {
-        assert(dk->dk_kind != DICT_KEYS_SPLIT);
+        if (cache_dk_index >= 0) {
+            assert(dk->dk_kind != DICT_KEYS_SPLIT);
 
-        PyDictUnicodeEntry *entries = DK_UNICODE_ENTRIES(dk);
+            PyDictUnicodeEntry *entries = DK_UNICODE_ENTRIES(dk);
 
-        result = entries[cache_dk_index].me_value;
+            result = entries[cache_dk_index].me_value;
 
-        if (unlikely(result == NULL)) {
-            Py_hash_t hash = ((Nuitka_StringObject *)%(var_name)s)->_base._base.hash;
-            assert(hash != -1);
+            if (unlikely(result == NULL)) {
+                Py_hash_t hash = ((Nuitka_StringObject *)%(var_name)s)->_base._base.hash;
+                assert(hash != -1);
 
-            cache_dk_index = Nuitka_Py_unicodekeys_lookup_unicode(dk, %(var_name)s, hash);
+                cache_dk_index = Nuitka_Py_unicodekeys_lookup_unicode(dk, %(var_name)s, hash);
 
-            if (cache_dk_index >= 0) {
-                result = entries[cache_dk_index].me_value;
+                if (cache_dk_index >= 0) {
+                    result = entries[cache_dk_index].me_value;
+                }
             }
+        } else {
+            result = NULL;
         }
     } else {
-        result = NULL;
+        result = GET_STRING_DICT_VALUE(moduledict_%(module_identifier)s, (Nuitka_StringObject *)%(var_name)s);
     }
 #endif