PyQt6-sip 13.6.0__tar.gz → 13.9.0__tar.gz

PyQt6_sip-13.9.0/LICENSE

@@ -0,0 +1,22 @@
+Copyright 2024 Phil Thompson <phil@riverbankcomputing.com>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

{PyQt6_sip-13.6.0 → PyQt6_sip-13.9.0}/MANIFEST.in

@@ -1,3 +1,2 @@
 include *.h
-include sip_bool.cpp
 include pyproject.toml

{PyQt6_sip-13.6.0 → PyQt6_sip-13.9.0}/PKG-INFO

@@ -1,18 +1,16 @@
 Metadata-Version: 2.1
 Name: PyQt6_sip
-Version: 13.6.0
+Version: 13.9.0
 Summary: The sip module support for PyQt6
-Home-page: https://www.riverbankcomputing.com/software/sip/
-Author: Riverbank Computing Limited
-Author-email: info@riverbankcomputing.com
+Home-page: https://github.com/Python-SIP/sip
+Author: Phil Thompson
+Author-email: phil@riverbankcomputing.com
 License: SIP
 Platform: X11
 Platform: macOS
 Platform: Windows
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 License-File: LICENSE
-License-File: LICENSE-GPL2
-License-File: LICENSE-GPL3
 
 sip Extension Module
 ====================

{PyQt6_sip-13.6.0 → PyQt6_sip-13.9.0}/PyQt6_sip.egg-info/PKG-INFO

@@ -1,18 +1,16 @@
 Metadata-Version: 2.1
 Name: PyQt6-sip
-Version: 13.6.0
+Version: 13.9.0
 Summary: The sip module support for PyQt6
-Home-page: https://www.riverbankcomputing.com/software/sip/
-Author: Riverbank Computing Limited
-Author-email: info@riverbankcomputing.com
+Home-page: https://github.com/Python-SIP/sip
+Author: Phil Thompson
+Author-email: phil@riverbankcomputing.com
 License: SIP
 Platform: X11
 Platform: macOS
 Platform: Windows
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 License-File: LICENSE
-License-File: LICENSE-GPL2
-License-File: LICENSE-GPL3
 
 sip Extension Module
 ====================

{PyQt6_sip-13.6.0 → PyQt6_sip-13.9.0}/PyQt6_sip.egg-info/SOURCES.txt

@@ -1,6 +1,4 @@
 LICENSE
-LICENSE-GPL2
-LICENSE-GPL3
 MANIFEST.in
 README
 pyproject.toml
@@ -9,7 +7,6 @@ setup.py
 sip.h
 sip_array.c
 sip_array.h
-sip_bool.cpp
 sip_core.c
 sip_core.h
 sip_descriptors.c

{PyQt6_sip-13.6.0 → PyQt6_sip-13.9.0}/setup.cfg

@@ -1,9 +1,9 @@
 [metadata]
 description = The sip module support for PyQt6
 long_description = file: README
-author = Riverbank Computing Limited
-author_email = info@riverbankcomputing.com
-url = https://www.riverbankcomputing.com/software/sip/
+author = Phil Thompson
+author_email = phil@riverbankcomputing.com
+url = https://github.com/Python-SIP/sip
 platforms = X11, macOS, Windows
 
 [egg_info]

PyQt6_sip-13.9.0/setup.py

@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: BSD-2-Clause
+
+# Copyright (c) 2024 Phil Thompson <phil@riverbankcomputing.com>
+
+
+import glob
+
+from setuptools import Extension, setup
+
+
+# Build the extension module.
+module_src = sorted(glob.glob('*.c'))
+
+module = Extension('PyQt6.sip', module_src)
+
+# Do the setup.
+setup(
+        name='PyQt6_sip',
+        version='13.9.0',
+        license='SIP',
+        python_requires='>=3.8',
+        ext_modules=[module]
+     )

{PyQt6_sip-13.6.0 → PyQt6_sip-13.9.0}/sip.h

@@ -1,19 +1,9 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
  * The SIP module interface.
  *
- * Copyright (c) 2023 Riverbank Computing Limited <info@riverbankcomputing.com>
- *
- * This file is part of SIP.
- *
- * This copy of SIP is licensed for use under the terms of the SIP License
- * Agreement.  See the file LICENSE for more details.
- *
- * This copy of SIP may also used under the terms of the GNU General Public
- * License v2 or v3 as published by the Free Software Foundation which can be
- * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
- *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * Copyright (c) 2024 Phil Thompson <phil@riverbankcomputing.com>
  */
 
 
@@ -24,8 +14,8 @@
 #include <Python.h>
 
 /* Sanity check on the Python version. */
-#if PY_VERSION_HEX < 0x03070000
-#error "This version of PyQt6.sip requires Python v3.7 or later"
+#if PY_VERSION_HEX < 0x03090000
+#error "This version of PyQt6.sip requires Python v3.9 or later"
 #endif
 
 
@@ -45,13 +35,26 @@ extern "C" {
 
 /* The version of the ABI. */
 #define SIP_ABI_MAJOR_VERSION       13
-#define SIP_ABI_MINOR_VERSION       6
+#define SIP_ABI_MINOR_VERSION       9
 #define SIP_MODULE_PATCH_VERSION    0
 
 
 /*
  * The change history of the ABI.
  *
+ * v13.9
+ *  - Python v3.9 or later is required.
+ *  - Added a new implementation of sipDeprecated() that takes an optional
+ *    supplementary message.
+ *
+ * v13.8
+ *  - Added the 'I' conversion character to the argument and result parsers.
+ *
+ * v13.7
+ *  - Added support for Python v3.13.
+ *  - Python v3.8 or later is required.
+ *  - C99 support is assumed.
+ *
  * v13.6
  *  - Added support for Python v3.12.
  *  - Added sipPyTypeDictRef().
@@ -79,8 +82,8 @@ extern "C" {
 
 
 /* The version of the code generator. */
-#define SIP_VERSION                 0x6070c
-#define SIP_VERSION_STR             "6.7.12"
+#define SIP_VERSION                 0x60900
+#define SIP_VERSION_STR             "6.9.0"
 
 /* These are all dependent on the user-specified name of the sip module. */
 #define _SIP_MODULE_FQ_NAME         "PyQt6.sip"
@@ -1427,7 +1430,7 @@ typedef struct _sipAPIDef {
     PyObject *(*api_is_py_method_12_8)(sip_gilstate_t *gil, char *pymc,
             sipSimpleWrapper **sipSelfp, const char *cname, const char *mname);
     sipExceptionHandler (*api_next_exception_handler)(void **statep);
-    void (*unused_private_2)(void);
+    int (*api_deprecated_13_9)(const char *classname, const char *method, const char *message);
     void (*unused_private_3)(void);
     void (*unused_private_4)(void);
     void (*unused_private_5)(void);

{PyQt6_sip-13.6.0 → PyQt6_sip-13.9.0}/sip_array.c

@@ -1,22 +1,13 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
  * This file implements the API for the array type.
  *
- * Copyright (c) 2023 Riverbank Computing Limited <info@riverbankcomputing.com>
- *
- * This file is part of SIP.
- *
- * This copy of SIP is licensed for use under the terms of the SIP License
- * Agreement.  See the file LICENSE for more details.
- *
- * This copy of SIP may also used under the terms of the GNU General Public
- * License v2 or v3 as published by the Free Software Foundation which can be
- * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
- *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * Copyright (c) 2024 Phil Thompson <phil@riverbankcomputing.com>
  */
 
 
+/* Remove when Python v3.12 is no longer supported. */
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 
@@ -320,7 +311,8 @@ static int sipArray_getbuffer(PyObject *self, Py_buffer *view, int flags)
 
     view->format = NULL;
     if ((flags & PyBUF_FORMAT) == PyBUF_FORMAT)
-        view->format = format;
+        /* Note that the need for a cast is probably a Python bug. */
+        view->format = (char *)format;
 
     view->ndim = 1;
 
@@ -384,7 +376,11 @@ static PyObject *sipArray_repr(PyObject *self)
  */
 static PyObject *sipArray_new(PyTypeObject *cls, PyObject *args, PyObject *kw)
 {
+#if PY_VERSION_HEX >= 0x030d0000
+    static char * const kwlist[] = {"", "", NULL};
+#else
     static char *kwlist[] = {"", "", NULL};
+#endif
 
     Py_ssize_t length;
     PyObject *array, *type;
@@ -483,9 +479,7 @@ PyTypeObject sipArray_Type = {
     0,                      /* tp_del */
     0,                      /* tp_version_tag */
     0,                      /* tp_finalize */
-#if PY_VERSION_HEX >= 0x03080000
     0,                      /* tp_vectorcall */
-#endif
 };
 
 

{PyQt6_sip-13.6.0 → PyQt6_sip-13.9.0}/sip_array.h

@@ -1,19 +1,9 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
  * This file defines the API for the array type.
  *
- * Copyright (c) 2022 Riverbank Computing Limited <info@riverbankcomputing.com>
- *
- * This file is part of SIP.
- *
- * This copy of SIP is licensed for use under the terms of the SIP License
- * Agreement.  See the file LICENSE for more details.
- *
- * This copy of SIP may also used under the terms of the GNU General Public
- * License v2 or v3 as published by the Free Software Foundation which can be
- * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
- *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * Copyright (c) 2024 Phil Thompson <phil@riverbankcomputing.com>
  */
 
 
@@ -21,6 +11,7 @@
 #define _SIP_ARRAY_H
 
 
+/* Remove when Python v3.12 is no longer supported. */
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 

{PyQt6_sip-13.6.0 → PyQt6_sip-13.9.0}/sip_core.c

@@ -1,22 +1,13 @@
+/* SPDX-License-Identifier: BSD-2-Clause */
+
 /*
  * The core sip module code.
  *
- * Copyright (c) 2023 Riverbank Computing Limited <info@riverbankcomputing.com>
- *
- * This file is part of SIP.
- *
- * This copy of SIP is licensed for use under the terms of the SIP License
- * Agreement.  See the file LICENSE for more details.
- *
- * This copy of SIP may also used under the terms of the GNU General Public
- * License v2 or v3 as published by the Free Software Foundation which can be
- * found in the files LICENSE-GPL2 and LICENSE-GPL3 included in this package.
- *
- * SIP is supplied WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * Copyright (c) 2024 Phil Thompson <phil@riverbankcomputing.com>
  */
 
 
+/* Remove when Python v3.12 is no longer supported. */
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <datetime.h>
@@ -34,12 +25,6 @@
 #include "sip_core.h"
 
 
-/* There doesn't seem to be a standard way of checking for C99 support. */
-#if !defined(va_copy)
-#define va_copy(d, s)   ((d) = (s))
-#endif
-
-
 /*
  * The Python metatype for a C++ wrapper type.  We inherit everything from the
  * standard Python metatype except the init and getattro methods and the size
@@ -103,9 +88,7 @@ PyTypeObject sipWrapperType_Type = {
     0,                      /* tp_del */
     0,                      /* tp_version_tag */
     0,                      /* tp_finalize */
-#if PY_VERSION_HEX >= 0x03080000
     0,                      /* tp_vectorcall */
-#endif
 };
 
 
@@ -171,9 +154,7 @@ static sipWrapperType sipWrapper_Type = {
             0,              /* tp_del */
             0,              /* tp_version_tag */
             0,              /* tp_finalize */
-#if PY_VERSION_HEX >= 0x03080000
             0,              /* tp_vectorcall */
-#endif
         },
         {
             0,              /* am_await */
@@ -246,9 +227,7 @@ static sipWrapperType sipWrapper_Type = {
         0,                  /* ht_slots */
         0,                  /* ht_qualname */
         0,                  /* ht_cached_keys */
-#if PY_VERSION_HEX >= 0x03090000
         0,                  /* ht_module */
-#endif
 #if !defined(STACKLESS)
     },
 #endif
@@ -566,7 +545,7 @@ static const sipAPIDef sip_api = {
     sip_api_instance_destroyed_ex,
     sip_api_is_py_method_12_8,
     sip_api_next_exception_handler,
-    NULL,
+    sip_api_deprecated_13_9,
     NULL,
     NULL,
     NULL,
@@ -893,10 +872,6 @@ const sipAPIDef *sip_init_library(PyObject *mod_dict)
     PyObject *obj;
     PyMethodDef *md;
 
-#if PY_VERSION_HEX < 0x03070000 && defined(WITH_THREAD)
-    PyEval_InitThreads();
-#endif
-
     if (sip_enum_init() < 0)
         return NULL;
 
@@ -2321,7 +2296,7 @@ static PyObject *buildObject(PyObject *obj, const char *fmt, va_list va)
             break;
 
         case '=':
-            el = PyLong_FromUnsignedLong(va_arg(va, size_t));
+            el = PyLong_FromSize_t(va_arg(va, size_t));
             break;
 
         case 'N':
@@ -2614,7 +2589,7 @@ static int parseResult(PyObject *method, PyObject *res,
             case 'a':
                 {
                     char *p = va_arg(va, char *);
-                    int enc;
+                    int enc = -1;
 
                     switch (*fmt++)
                     {
@@ -2629,9 +2604,6 @@ static int parseResult(PyObject *method, PyObject *res,
                     case '8':
                         enc = parseString_AsUTF8Char(arg, p);
                         break;
-
-                    default:
-                        enc = -1;
                     }
 
                     if (enc < 0)
@@ -2695,6 +2667,19 @@ static int parseResult(PyObject *method, PyObject *res,
 
                 break;
 
+            case 'I':
+                {
+                    char *p = va_arg(va, char *);
+                    char v = sip_api_long_as_char(arg);
+
+                    if (PyErr_Occurred())
+                        invalid = TRUE;
+                    else if (p != NULL)
+                        *p = v;
+                }
+
+                break;
+
             case 'L':
                 {
                     signed char *p = va_arg(va, signed char *);
@@ -2855,7 +2840,7 @@ static int parseResult(PyObject *method, PyObject *res,
                 {
                     int key = va_arg(va, int);
                     const char **p = va_arg(va, const char **);
-                    PyObject *keep;
+                    PyObject *keep = NULL;
 
                     switch (*fmt++)
                     {
@@ -2870,9 +2855,6 @@ static int parseResult(PyObject *method, PyObject *res,
                     case '8':
                         keep = parseString_AsUTF8String(arg, p);
                         break;
-
-                    default:
-                        keep = NULL;
                     }
 
                     if (keep == NULL)
@@ -4322,9 +4304,28 @@ static int parsePass1(PyObject **parseErrp, PyObject **selfp, int *selfargp,
                 break;
             }
 
+        case 'I':
+            {
+                /* Char as an integer. */
+
+                char *p = va_arg(va, char *);
+
+                if (arg != NULL)
+                {
+                    char v = sip_api_long_as_char(arg);
+
+                    if (PyErr_Occurred())
+                        handle_failed_int_conversion(&failure, arg);
+                    else
+                        *p = v;
+                }
+
+                break;
+            }
+
         case 'L':
             {
-                /* Signed char. */
+                /* Signed char as an integer. */
 
                 signed char *p = va_arg(va, signed char *);
 
@@ -4343,7 +4344,7 @@ static int parsePass1(PyObject **parseErrp, PyObject **selfp, int *selfargp,
 
         case 'M':
             {
-                /* Unsigned char. */
+                /* Unsigned char as an integer. */
 
                 unsigned char *p = va_arg(va, unsigned char *);
 
@@ -4943,6 +4944,8 @@ static int parsePass2(PyObject *self, int selfarg, PyObject *sipArgs,
 
                 if (flags & FMT_AP_TRANSFER_THIS)
                     owner = va_arg(va, PyObject **);
+                else
+                    owner = NULL;
 
                 if (flags & FMT_AP_NO_CONVERTORS)
                 {
@@ -4969,7 +4972,7 @@ static int parsePass2(PyObject *self, int selfarg, PyObject *sipArgs,
                     if (iserr)
                         return FALSE;
 
-                    if (flags & FMT_AP_TRANSFER_THIS && *p != NULL)
+                    if (owner != NULL && *p != NULL)
                         *owner = arg;
                 }
 
@@ -5057,7 +5060,7 @@ static int parsePass2(PyObject *self, int selfarg, PyObject *sipArgs,
 
                 if (arg != NULL)
                 {
-                    int enc;
+                    int enc = -1;
 
                     switch (sub_fmt)
                     {
@@ -6663,6 +6666,16 @@ static void sip_api_abstract_method(const char *classname, const char *method)
  * Report a deprecated class or method.
  */
 int sip_api_deprecated(const char *classname, const char *method)
+{
+    return sip_api_deprecated_13_9(classname, method, NULL);
+}
+
+
+/*
+ * Report a deprecated class or method with an optional message.
+ */
+int sip_api_deprecated_13_9(const char *classname, const char *method,
+        const char *message)
 {
     char buf[100];
 
@@ -6673,7 +6686,10 @@ int sip_api_deprecated(const char *classname, const char *method)
                 classname);
     else
         PyOS_snprintf(buf, sizeof (buf), "%s.%s() is deprecated", classname,
-                method);
+                method );
+
+    if (message != NULL)
+        PyOS_snprintf(&buf[strlen(buf)], sizeof (buf), ": %s", message);
 
     return PyErr_WarnEx(PyExc_DeprecationWarning, buf, 1);
 }
@@ -9503,6 +9519,10 @@ static PyObject *slot_richcompare(PyObject *self, PyObject *arg, int op)
     case Py_GE:
         st = ge_slot;
         break;
+
+    default:
+        /* Suppress a compiler warning. */
+        st = -1;
     }
 
     /* It might not exist if not all the above have been implemented. */
@@ -9632,9 +9652,7 @@ sipWrapperType sipSimpleWrapper_Type = {
             0,              /* tp_del */
             0,              /* tp_version_tag */
             0,              /* tp_finalize */
-#if PY_VERSION_HEX >= 0x03080000
             0,              /* tp_vectorcall */
-#endif
         },
         {
             0,              /* am_await */
@@ -9707,9 +9725,7 @@ sipWrapperType sipSimpleWrapper_Type = {
         0,                  /* ht_slots */
         0,                  /* ht_qualname */
         0,                  /* ht_cached_keys */
-#if PY_VERSION_HEX >= 0x03090000
         0,                  /* ht_module */
-#endif
 #if !defined(STACKLESS)
     },
 #endif
@@ -11453,7 +11469,6 @@ static void *sip_api_unicode_data(PyObject *obj, int *char_size,
  */
 static int sip_api_get_buffer_info(PyObject *obj, sipBufferInfoDef *bi)
 {
-    int rc;
     Py_buffer *buffer;
 
     if (!PyObject_CheckBuffer(obj))
@@ -11467,27 +11482,16 @@ static int sip_api_get_buffer_info(PyObject *obj, sipBufferInfoDef *bi)
 
     buffer = (Py_buffer *)bi->bi_internal;
 
-    if (PyObject_GetBuffer(obj, buffer, PyBUF_FORMAT) < 0)
+    if (PyObject_GetBuffer(obj, buffer, PyBUF_SIMPLE) < 0)
         return -1;
 
-    if (buffer->ndim == 1)
-    {
-        bi->bi_buf = buffer->buf;
-        bi->bi_obj = buffer->obj;
-        bi->bi_len = buffer->len;
-        bi->bi_readonly = buffer->readonly;
-        bi->bi_format = buffer->format;
-
-        rc = 1;
-    }
-    else
-    {
-        PyErr_SetString(PyExc_TypeError, "a 1-dimensional buffer is required");
-        PyBuffer_Release(buffer);
-        rc = -1;
-    }
+    bi->bi_buf = buffer->buf;
+    bi->bi_obj = buffer->obj;
+    bi->bi_len = buffer->len;
+    bi->bi_readonly = buffer->readonly;
+    bi->bi_format = buffer->format;
 
-    return rc;
+    return 1;
 }
 
 
@@ -11823,22 +11827,18 @@ PyObject *sip_get_qualname(const sipTypeDef *td, PyObject *name)
 
 
 /*
- * Implement PySlice_GetIndicesEx() (or its subsequent replacement).
+ * Unpack a slice object.
  */
 int sip_api_convert_from_slice_object(PyObject *slice, Py_ssize_t length,
         Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step,
         Py_ssize_t *slicelength)
 {
-#if PY_VERSION_HEX >= 0x03070000
     if (PySlice_Unpack(slice, start, stop, step) < 0)
         return -1;
 
     *slicelength = PySlice_AdjustIndices(length, start, stop, *step);
 
     return 0;
-#else
-    return PySlice_GetIndicesEx(slice, length, start, stop, step, slicelength);
-#endif
 }