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

nuitka/build/static_src/MetaPathBasedLoaderImportlibMetadataDistribution.c

@@ -1,20 +1,5 @@
-//     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-//
-//     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.
-//
+//     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
 // This implements the "importlib.metadata.distribution" values, also for
 // the backport "importlib_metadata.distribution"
 
@@ -28,7 +13,16 @@
 static PyObject *metadata_values_dict = NULL;
 
 // For initialization of the metadata dictionary during startup.
-void setDistributionsMetadata(PyObject *metadata_values) { metadata_values_dict = metadata_values; }
+void setDistributionsMetadata(PyThreadState *tstate, PyObject *metadata_values) {
+    metadata_values_dict = MAKE_DICT_EMPTY(tstate);
+
+    // We get the items passed, and need to add it to the dictionary.
+    int res = PyDict_MergeFromSeq2(metadata_values_dict, metadata_values, 1);
+    assert(res == 0);
+
+    // PRINT_ITEM(metadata_values_dict);
+    // PRINT_NEW_LINE();
+}
 
 bool Nuitka_DistributionNext(Py_ssize_t *pos, PyObject **distribution_name_ptr) {
     PyObject *value;
@@ -50,8 +44,8 @@ if sys.version_info >= (3, 8):\n\
 else:\n\
     from importlib_metadata import Distribution,distribution\n\
 class nuitka_distribution(Distribution):\n\
-    def __init__(self, base_path, metadata, entry_points):\n\
-        self.base_path = base_path; self.metadata_data = metadata\n\
+    def __init__(self, path, metadata, entry_points):\n\
+        self._path = path; self.metadata_data = metadata\n\
         self.entry_points_data = entry_points\n\
     def read_text(self, filename):\n\
         if filename == 'METADATA':\n\
@@ -59,7 +53,7 @@ class nuitka_distribution(Distribution):\n\
         elif filename == 'entry_points.txt':\n\
             return self.entry_points_data\n\
     def locate_file(self, path):\n\
-        return os.path.join(self.base_path, path)\n\
+        return os.path.join(self._path, path)\n\
 ";
 
         PyObject *nuitka_distribution_code_object = Py_CompileString(nuitka_distribution_code, "<exec>", Py_file_input);
@@ -76,8 +70,10 @@ class nuitka_distribution(Distribution):\n\
             importlib_metadata_distribution = PyObject_GetAttrString(module, "distribution");
             CHECK_OBJECT(importlib_metadata_distribution);
 
-            bool bool_res = Nuitka_DelModuleString(tstate, "nuitka_distribution_patch");
-            assert(bool_res != false);
+            {
+                NUITKA_MAY_BE_UNUSED bool bool_res = Nuitka_DelModuleString(tstate, "nuitka_distribution_patch");
+                assert(bool_res != false);
+            }
 
             Py_DECREF(module);
         }
@@ -95,10 +91,12 @@ class nuitka_distribution(Distribution):\n\
 
         struct Nuitka_MetaPathBasedLoaderEntry *entry = findEntry(Nuitka_String_AsString_Unchecked(package_name));
 
-        if (entry == NULL) {
-            PyObject *result = CALL_FUNCTION_WITH_SINGLE_ARG(tstate, importlib_metadata_distribution, name);
+        if (unlikely(entry == NULL)) {
+            SET_CURRENT_EXCEPTION_TYPE0_FORMAT1(PyExc_RuntimeError,
+                                                "cannot locate package '%s' associated with metadata",
+                                                Nuitka_String_AsString(package_name));
 
-            return result;
+            return NULL;
         }
 
         PyObject *args[3] = {getModuleDirectory(tstate, entry), metadata, entry_points};
@@ -107,3 +105,18 @@ class nuitka_distribution(Distribution):\n\
         return result;
     }
 }
+
+//     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/build/static_src/MetaPathBasedLoaderResourceReader.c

@@ -1,20 +1,5 @@
-//     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-//
-//     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.
-//
+//     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
 // This implements the resource reader for of C compiled modules and
 // shared library extension modules bundled for standalone mode with
 // newer Python.
@@ -156,4 +141,18 @@ static PyObject *Nuitka_ResourceReader_New(struct Nuitka_MetaPathBasedLoaderEntr
     return (PyObject *)result;
 }
 
-#endif
+#endif
+//     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/build/static_src/MetaPathBasedLoaderResourceReaderFiles.c

@@ -1,20 +1,5 @@
-//     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-//
-//     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.
-//
+//     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
 // This implements the resource reader for of C compiled modules and
 // shared library extension modules bundled for standalone mode with
 // newer Python.
@@ -126,7 +111,7 @@ static PyObject *Nuitka_ResourceReaderFiles_iterdir(struct Nuitka_ResourceReader
         return NULL;
     }
 
-    PyObject *files_objects = MAKE_LIST_EMPTY(0);
+    PyObject *files_objects = MAKE_LIST_EMPTY(tstate, 0);
 
     Py_ssize_t n = PyList_GET_SIZE(file_names);
     for (Py_ssize_t i = 0; i < n; i++) {
@@ -137,8 +122,10 @@ static PyObject *Nuitka_ResourceReaderFiles_iterdir(struct Nuitka_ResourceReader
         CHECK_OBJECT(joined);
 
         PyObject *files_object = Nuitka_ResourceReaderFiles_New(tstate, files->m_loader_entry, joined);
-        bool res = LIST_APPEND1(files_objects, files_object);
-        assert(res);
+        {
+            NUITKA_MAY_BE_UNUSED bool res = LIST_APPEND1(files_objects, files_object);
+            assert(res);
+        }
 
         CHECK_OBJECT(files_object);
         Py_DECREF(joined);
@@ -219,6 +206,16 @@ static PyObject *Nuitka_ResourceReaderFiles_read_text(struct Nuitka_ResourceRead
     return result;
 }
 
+static PyObject *Nuitka_ResourceReaderFiles_exists(struct Nuitka_ResourceReaderFilesObject *files, PyObject *args,
+                                                   PyObject *kwds) {
+
+    PyThreadState *tstate = PyThreadState_GET();
+    PyObject *file_name = _Nuitka_ResourceReaderFiles_GetPath(tstate, files);
+    PyObject *result = OS_PATH_FILE_EXISTS(tstate, file_name);
+    Py_DECREF(file_name);
+    return result;
+}
+
 //    @abc.abstractmethod
 //    def is_dir(self) -> bool:
 //        """
@@ -314,6 +311,39 @@ static PyObject *Nuitka_ResourceReaderFiles_joinpath(struct Nuitka_ResourceReade
     return result;
 }
 
+//    def def as_posix(self):
+//        """
+//        Return Traversable child in self
+//        """
+//
+
+static PyObject *Nuitka_ResourceReaderFiles_as_posix(struct Nuitka_ResourceReaderFilesObject *files, PyObject *args,
+                                                     PyObject *kwds) {
+    PyThreadState *tstate = PyThreadState_GET();
+    PyObject *path = _Nuitka_ResourceReaderFiles_GetPath(tstate, files);
+
+#ifdef _WIN32
+
+#if PYTHON_VERSION < 0x300
+    PyObject *result;
+
+    if (PyString_Check(path)) {
+        result = STR_REPLACE3(tstate, path, const_str_backslash, const_str_slash);
+    } else {
+        result = UNICODE_REPLACE3(tstate, path, const_str_backslash, const_str_slash);
+    }
+#else
+    PyObject *result = UNICODE_REPLACE3(tstate, path, const_str_backslash, const_str_slash);
+#endif
+
+    Py_DECREF(path);
+
+    return result;
+#else
+    return path;
+#endif
+}
+
 PyObject *Nuitka_ResourceReaderFiles_nb_truediv(struct Nuitka_ResourceReaderFilesObject *files, PyObject *arg) {
     PyObject *joined;
 
@@ -388,7 +418,7 @@ static PyObject *Nuitka_ResourceReaderFiles_enter(struct Nuitka_ResourceReaderFi
 static PyObject *Nuitka_ResourceReaderFiles_exit(struct Nuitka_ResourceReaderFilesObject *files) {
     CHECK_OBJECT(files);
 
-    Py_INCREF(Py_None);
+    Py_INCREF_IMMORTAL(Py_None);
     return Py_None;
 }
 
@@ -412,10 +442,158 @@ static PyObject *Nuitka_ResourceReaderFiles_absolute(struct Nuitka_ResourceReade
     return Nuitka_ResourceReaderFiles_New(tstate, files->m_loader_entry, abspath);
 }
 
+static PyObject *Nuitka_ResourceReaderFiles_get_parent(PyObject *self, void *data) {
+    PyThreadState *tstate = PyThreadState_GET();
+
+    struct Nuitka_ResourceReaderFilesObject *files = (struct Nuitka_ResourceReaderFilesObject *)self;
+    PyObject *path = _Nuitka_ResourceReaderFiles_GetPath(tstate, files);
+
+    PyObject *abspath = OS_PATH_ABSPATH(tstate, path);
+
+    if (unlikely(abspath == NULL)) {
+        return NULL;
+    }
+
+    PyObject *dirname = OS_PATH_DIRNAME(tstate, abspath);
+
+    if (unlikely(dirname == NULL)) {
+        return NULL;
+    }
+
+    return Nuitka_ResourceReaderFiles_New(tstate, files->m_loader_entry, dirname);
+}
+
+static int Nuitka_ResourceReaderFiles_set_parent(PyObject *self, PyObject *value, void *data) {
+    PyThreadState *tstate = PyThreadState_GET();
+
+    SET_CURRENT_EXCEPTION_TYPE0_STR(tstate, PyExc_AttributeError, "readonly attribute");
+    return -1;
+}
+
+static PyObject *Nuitka_ResourceReaderFiles_get_suffix(PyObject *self, void *data) {
+    PyThreadState *tstate = PyThreadState_GET();
+
+    struct Nuitka_ResourceReaderFilesObject *files = (struct Nuitka_ResourceReaderFilesObject *)self;
+    PyObject *path = _Nuitka_ResourceReaderFiles_GetPath(tstate, files);
+
+    PyObject *basename = OS_PATH_BASENAME(tstate, path);
+    Py_DECREF(path);
+
+    PyObject *dot_index = UNICODE_RFIND2(tstate, basename, const_str_dot);
+
+    PyObject *result;
+    if (dot_index == Py_None) {
+        result = const_str_empty;
+        Py_INCREF_IMMORTAL(result);
+    } else {
+        result = PyUnicode_Substring(basename, PyLong_AsLong(dot_index), PyUnicode_GetLength(basename));
+    }
+
+    Py_DECREF(basename);
+    Py_DECREF(dot_index);
+
+    return result;
+}
+
+// TODO: Why don't we just share this method.
+static int Nuitka_ResourceReaderFiles_set_suffix(PyObject *self, PyObject *value, void *data) {
+    PyThreadState *tstate = PyThreadState_GET();
+
+    SET_CURRENT_EXCEPTION_TYPE0_STR(tstate, PyExc_AttributeError, "readonly attribute");
+    return -1;
+}
+
+static PyObject *Nuitka_ResourceReaderFiles_get_stem(PyObject *self, void *data) {
+    PyThreadState *tstate = PyThreadState_GET();
+
+    struct Nuitka_ResourceReaderFilesObject *files = (struct Nuitka_ResourceReaderFilesObject *)self;
+    PyObject *path = _Nuitka_ResourceReaderFiles_GetPath(tstate, files);
+
+    PyObject *basename = OS_PATH_BASENAME(tstate, path);
+    Py_DECREF(path);
+
+    PyObject *dot_index = UNICODE_RFIND2(tstate, basename, const_str_dot);
+    CHECK_OBJECT(dot_index);
+
+    PyObject *result;
+
+    if (dot_index == Py_None) {
+        result = const_str_empty;
+        Py_INCREF_IMMORTAL(result);
+    } else {
+        int dot_index_long = PyLong_AsLong(dot_index);
+
+        if (dot_index_long > 0 && dot_index_long < PyUnicode_GetLength(basename) - 1) {
+            result = PyUnicode_Substring(basename, 0, PyLong_AsLong(dot_index));
+        } else {
+            Py_INCREF(basename);
+            result = basename;
+        }
+    }
+
+    Py_DECREF(basename);
+    Py_DECREF(dot_index);
+
+    CHECK_OBJECT(result);
+
+    return result;
+}
+
+// TODO: Why don't we just share this method.
+static int Nuitka_ResourceReaderFiles_set_stem(PyObject *self, PyObject *value, void *data) {
+    PyThreadState *tstate = PyThreadState_GET();
+
+    SET_CURRENT_EXCEPTION_TYPE0_STR(tstate, PyExc_AttributeError, "readonly attribute");
+    return -1;
+}
+
+static PyObject *Nuitka_ResourceReaderFiles_get_suffixes(PyObject *self, void *data) {
+    PyThreadState *tstate = PyThreadState_GET();
+
+    struct Nuitka_ResourceReaderFilesObject *files = (struct Nuitka_ResourceReaderFilesObject *)self;
+    PyObject *path = _Nuitka_ResourceReaderFiles_GetPath(tstate, files);
+
+    PyObject *basename = OS_PATH_BASENAME(tstate, path);
+    Py_DECREF(path);
+
+    PyObject *result = MAKE_LIST_EMPTY(tstate, 0);
+
+    if (UNICODE_ENDSWITH2(tstate, basename, const_str_dot) == Py_True) {
+        return result;
+    }
+
+    PyObject *current = UNICODE_LSTRIP2(tstate, basename, const_str_dot);
+
+    PyObject *parts = UNICODE_SPLIT2(tstate, current, const_str_dot);
+    Py_DECREF(current);
+
+    for (Py_ssize_t i = 1; i < PyList_GET_SIZE(parts); i++) {
+        current = const_str_dot;
+        Py_INCREF_IMMORTAL(current);
+
+        UNICODE_APPEND(tstate, &current, PyList_GET_ITEM(parts, i));
+
+        LIST_APPEND0(result, current);
+    }
+
+    CHECK_OBJECT_DEEP(result);
+
+    return result;
+}
+
+// TODO: Why don't we just share this method.
+static int Nuitka_ResourceReaderFiles_set_suffixes(PyObject *self, PyObject *value, void *data) {
+    PyThreadState *tstate = PyThreadState_GET();
+
+    SET_CURRENT_EXCEPTION_TYPE0_STR(tstate, PyExc_AttributeError, "readonly attribute");
+    return -1;
+}
+
 static PyMethodDef Nuitka_ResourceReaderFiles_methods[] = {
     {"iterdir", (PyCFunction)Nuitka_ResourceReaderFiles_iterdir, METH_NOARGS, NULL},
     {"read_bytes", (PyCFunction)Nuitka_ResourceReaderFiles_read_bytes, METH_NOARGS, NULL},
     {"read_text", (PyCFunction)Nuitka_ResourceReaderFiles_read_text, METH_VARARGS | METH_KEYWORDS, NULL},
+    {"exists", (PyCFunction)Nuitka_ResourceReaderFiles_exists, METH_NOARGS, NULL},
     {"is_dir", (PyCFunction)Nuitka_ResourceReaderFiles_is_dir, METH_NOARGS, NULL},
     {"is_file", (PyCFunction)Nuitka_ResourceReaderFiles_is_file, METH_NOARGS, NULL},
     {"joinpath", (PyCFunction)Nuitka_ResourceReaderFiles_joinpath, METH_VARARGS | METH_KEYWORDS, NULL},
@@ -424,6 +602,7 @@ static PyMethodDef Nuitka_ResourceReaderFiles_methods[] = {
     {"__exit__", (PyCFunction)Nuitka_ResourceReaderFiles_exit, METH_VARARGS, NULL},
     {"__fspath__", (PyCFunction)Nuitka_ResourceReaderFiles_fspath, METH_NOARGS, NULL},
     {"absolute", (PyCFunction)Nuitka_ResourceReaderFiles_absolute, METH_NOARGS, NULL},
+    {"as_posix", (PyCFunction)Nuitka_ResourceReaderFiles_as_posix, METH_NOARGS, NULL},
 
     // Nuitka specific, for "importlib.resource.as_file" overload.
     {"as_file", (PyCFunction)Nuitka_ResourceReaderFiles_as_file, METH_NOARGS, NULL},
@@ -436,9 +615,10 @@ static PyMethodDef Nuitka_ResourceReaderFiles_methods[] = {
 //        The base name of this object without any parent references.
 //        """
 
-static PyObject *Nuitka_ResourceReaderFiles_get_name(struct Nuitka_ResourceReaderFilesObject *files) {
+static PyObject *Nuitka_ResourceReaderFiles_get_name(PyObject *self, void *data) {
     PyThreadState *tstate = PyThreadState_GET();
 
+    struct Nuitka_ResourceReaderFilesObject *files = (struct Nuitka_ResourceReaderFilesObject *)self;
     PyObject *file_name = _Nuitka_ResourceReaderFiles_GetPath(tstate, files);
     PyObject *result = OS_PATH_BASENAME(tstate, file_name);
     Py_DECREF(file_name);
@@ -446,7 +626,7 @@ static PyObject *Nuitka_ResourceReaderFiles_get_name(struct Nuitka_ResourceReade
     return result;
 }
 
-static int Nuitka_ResourceReaderFiles_set_name(struct Nuitka_ResourceReaderFilesObject *files, PyObject *value) {
+static int Nuitka_ResourceReaderFiles_set_name(PyObject *self, PyObject *value, void *data) {
     PyThreadState *tstate = PyThreadState_GET();
 
     SET_CURRENT_EXCEPTION_TYPE0_STR(tstate, PyExc_AttributeError, "readonly attribute");
@@ -454,7 +634,7 @@ static int Nuitka_ResourceReaderFiles_set_name(struct Nuitka_ResourceReaderFiles
 }
 
 static PyObject *Nuitka_ResourceReaderFiles_tp_richcompare(struct Nuitka_ResourceReaderFilesObject *files_a,
-                                                           PyObject *other, int op) {
+                                                           PyObject *other, int op_id) {
     PyObject *a = PyObject_Str((PyObject *)files_a);
     CHECK_OBJECT(a);
 
@@ -464,15 +644,19 @@ static PyObject *Nuitka_ResourceReaderFiles_tp_richcompare(struct Nuitka_Resourc
         return NULL;
     }
 
-    PyObject *result = PyObject_RichCompare(a, b, op);
+    PyObject *result = PyObject_RichCompare(a, b, op_id);
 
     Py_DECREF(b);
 
     return result;
 }
 
-static PyGetSetDef Nuitka_ResourceReaderFiles_getset[] = {
-    {(char *)"name", (getter)Nuitka_ResourceReaderFiles_get_name, (setter)Nuitka_ResourceReaderFiles_set_name, NULL},
+static PyGetSetDef Nuitka_ResourceReaderFiles_tp_getset[] = {
+    {(char *)"name", Nuitka_ResourceReaderFiles_get_name, Nuitka_ResourceReaderFiles_set_name, NULL},
+    {(char *)"parent", Nuitka_ResourceReaderFiles_get_parent, Nuitka_ResourceReaderFiles_set_parent, NULL},
+    {(char *)"suffix", Nuitka_ResourceReaderFiles_get_suffix, Nuitka_ResourceReaderFiles_set_suffix, NULL},
+    {(char *)"stem", Nuitka_ResourceReaderFiles_get_stem, Nuitka_ResourceReaderFiles_set_stem, NULL},
+    {(char *)"suffixes", Nuitka_ResourceReaderFiles_get_suffixes, Nuitka_ResourceReaderFiles_set_suffixes, NULL},
     {NULL}};
 
 // Initialized during readying the type for nb_truediv
@@ -507,7 +691,7 @@ static PyTypeObject Nuitka_ResourceReaderFiles_Type = {
     0,                                                      // tp_iternext
     Nuitka_ResourceReaderFiles_methods,                     // tp_methods
     0,                                                      // tp_members
-    Nuitka_ResourceReaderFiles_getset,                      // tp_getset
+    Nuitka_ResourceReaderFiles_tp_getset,                   // tp_getset
 };
 
 #if PYTHON_VERSION >= 0x390
@@ -571,4 +755,18 @@ static PyObject *Nuitka_ResourceReaderFiles_New(PyThreadState *tstate,
     Py_INCREF(path);
 
     return (PyObject *)result;
-}
+}
+//     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.