update to PyWinRT 1.0.0-beta.8

Author: dlech

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 ### Changed
 - Updated CppWinRT to v2.0.230225.1.
+- Update PyWinRT to [v1.0.0-beta.8](https://github.com/pywinrt/pywinrt/releases/tag/v1.0.0-beta.8).
 
 ## [v1.0.0b7] - 2022-09-09
 

generate.ps1

@@ -1,6 +1,6 @@
 param ([switch]$skipNugetInstall)
 
-$pywinrt_version = '1.0.0-beta.7'
+$pywinrt_version = '1.0.0-beta.8'
 $cppwinrt_version = '2.0.230225.1'
 $windows_sdk_version = '10.0.22621.0+'
 $repoRootPath = (Get-Item $PSScriptRoot).FullName

pywinrt/winsdk/__init__.py

@@ -1,40 +1,9 @@
-# WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.7
-
+# WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.8
 
+import array
+import types
+import typing
 import sys
-import uuid
-
-if sys.version_info >= (3, 9):
-    from typing import Annotated
-    # type aliases with struct format string annotation
-    Boolean = Annotated[bool, "?"]
-    Int8 = Annotated[int, "b"]
-    UInt8 = Annotated[int, "B"]
-    Int16 = Annotated[int, "h"]
-    UInt16 = Annotated[int, "H"]
-    Int32 = Annotated[int, "i"]
-    UInt32 = Annotated[int, "I"]
-    Int64 = Annotated[int, "q"]
-    UInt64 = Annotated[int, "Q"]
-    Single = Annotated[float, "f"]
-    Double = Annotated[float, "d"]
-else:
-    Boolean = bool
-    Int8 = int
-    UInt8 = int
-    Int16 = int
-    UInt16 = int
-    Int32 = int
-    UInt32 = int
-    Int64 = int
-    UInt64 = int
-    Single = float
-    Double = float
-
-Char16 = UInt16  # Char16 also implies valid UTF-16 codepoint
-
-# WinRT GUIDs are marshaled to Python UUIDs
-Guid = uuid.UUID
 
 MTA: int
 STA: int
@@ -43,5 +12,66 @@ def init_apartment(apartment_type: int) -> None: ...
 def uninit_apartment() -> None: ...
 def initialize_with_window(obj: Object, hwnd: int) -> None: ...
 
-class Object:
-    pass
+class Object: ...
+
+_Self = typing.TypeVar("_Self")
+_T = typing.TypeVar("_T")
+
+class Array(typing.MutableSequence[_T]):
+    _winrt_element_type_name_: str
+    if sys.version_info >= (3, 9):
+        def __class_getitem__(cls, key: typing.Any) -> types.GenericAlias: ...
+
+    @typing.overload
+    def __new__(
+        cls: typing.Type[_Self],
+        __type: typing.Union[typing.Type[_T], str],
+        __size: int,
+        /,
+    ) -> _Self: ...
+    @typing.overload
+    def __new__(
+        cls: typing.Type[_Self],
+        __type: typing.Union[typing.Type[_T], str],
+        __initializer: memoryview,
+        /,
+    ) -> _Self: ...
+    @typing.overload
+    def __new__(
+        cls: typing.Type[_Self], __type: str, __initializer: array.array, /
+    ) -> _Self: ...
+    @typing.overload
+    def __new__(
+        cls: typing.Type[_Self],
+        __type: typing.Union[typing.Type[_T], str],
+        __initializer: Array[_T],
+        /,
+    ) -> _Self: ...
+    @typing.overload
+    def __new__(
+        cls: typing.Type[_Self],
+        __type: typing.Union[typing.Type[_T], str],
+        __initializer: typing.List[_T],
+        /,
+    ) -> _Self: ...
+    @typing.overload
+    def __new__(
+        cls: typing.Type[_Self],
+        __type: typing.Union[typing.Type[_T], str],
+        __initializer: typing.Tuple[_T],
+        /,
+    ) -> _Self: ...
+    def __len__(self) -> int: ...
+    @typing.overload
+    def __getitem__(self, index: typing.SupportsIndex) -> _T: ...
+    @typing.overload
+    def __getitem__(self, index: slice) -> typing.MutableSequence[_T]: ...
+    @typing.overload
+    def __setitem__(self, index: typing.SupportsIndex, value: _T) -> None: ...
+    @typing.overload
+    def __setitem__(self, index: slice, value: typing.Iterable[_T]) -> None: ...
+    @typing.overload
+    def __delitem__(self, index: typing.SupportsIndex) -> None: ...
+    @typing.overload
+    def __delitem__(self, index: slice) -> None: ...
+    def insert(self, index: typing.SupportsIndex, value: _T) -> None: ...

pywinrt/winsdk/_winrt.pyi

@@ -1,4 +1,4 @@
-// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.7
+// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.8
 
 #include "pybase.h"
 #include <Shobjidl.h>
@@ -9,6 +9,7 @@ namespace py::cpp::_winrt
     struct module_state
     {
         PyTypeObject* Object_type;
+        PyTypeObject* Array_type;
         PyTypeObject* MappingIter_type;
     };
 
@@ -31,7 +32,13 @@ namespace py::cpp::_winrt
         py::winrt_wrapper<winrt::Windows::Foundation::IInspectable>* self)
     {
         auto tp = Py_TYPE(self);
-        self->obj = nullptr;
+
+        if (PyType_IS_GC(tp))
+        {
+            PyObject_GC_UnTrack(self);
+        }
+
+        std::destroy_at(&self->obj);
         tp->tp_free(self);
         Py_DECREF(tp);
     }
@@ -52,6 +59,15 @@ namespace py::cpp::_winrt
 
     // END: class _winrt.Object:
 
+    // BEGIN: class _winrt.Array:
+
+    extern PyType_Spec Array_type_spec;
+#if PY_VERSION_HEX < 0x03090000
+    extern PyBufferProcs Array_buffer_procs;
+#endif
+
+    // END: class _winrt.Array:
+
     // BEGIN: class _winrt.MappingIter:
 
     // This class is used to wrap the iterator returned by IMap/IMapView so
@@ -238,6 +254,7 @@ namespace py::cpp::_winrt
         assert(state);
 
         Py_VISIT(state->Object_type);
+        Py_VISIT(state->Array_type);
         Py_VISIT(state->MappingIter_type);
 
         return 0;
@@ -249,6 +266,7 @@ namespace py::cpp::_winrt
         assert(state);
 
         Py_CLEAR(state->Object_type);
+        Py_CLEAR(state->Array_type);
         Py_CLEAR(state->MappingIter_type);
 
         return 0;
@@ -272,6 +290,29 @@ namespace py::cpp::_winrt
         static const auto kSTA
             = static_cast<long>(winrt::apartment_type::single_threaded);
 
+        py::pyobj_handle collections_abc_module{
+            PyImport_ImportModule("collections.abc")};
+
+        if (!collections_abc_module)
+        {
+            return nullptr;
+        }
+
+        py::pyobj_handle mutable_sequence_type{
+            PyObject_GetAttrString(collections_abc_module.get(), "MutableSequence")};
+
+        if (!mutable_sequence_type)
+        {
+            return nullptr;
+        }
+
+        py::pyobj_handle array_bases{PyTuple_Pack(1, mutable_sequence_type.get())};
+
+        if (!array_bases)
+        {
+            return nullptr;
+        }
+
         py::pyobj_handle module{PyModule_Create(&module_def)};
 
         if (!module)
@@ -283,25 +324,33 @@ namespace py::cpp::_winrt
         assert(state);
 
         state->Object_type = py::register_python_type(
-            module.get(), _type_name_Object, &Object_type_spec, nullptr);
+            module.get(), _type_name_Object, &Object_type_spec, nullptr, nullptr);
 
         if (!state->Object_type)
         {
             return nullptr;
         }
 
-        Py_INCREF(state->Object_type);
+        state->Array_type = py::register_python_type(
+            module.get(), "Array", &Array_type_spec, array_bases.get(), nullptr);
+
+        if (!state->Array_type)
+        {
+            return nullptr;
+        }
+
+#if PY_VERSION_HEX < 0x03090000
+        state->Array_type->tp_as_buffer = &Array_buffer_procs;
+#endif
 
         state->MappingIter_type = py::register_python_type(
-            module.get(), "MappingIter", &MappingIter_type_spec, nullptr);
+            module.get(), "MappingIter", &MappingIter_type_spec, nullptr, nullptr);
 
         if (!state->MappingIter_type)
         {
             return nullptr;
         }
 
-        Py_INCREF(state->MappingIter_type);
-
         if (PyModule_AddIntConstant(module.get(), "MTA", kMTA) == -1)
         {
             return nullptr;
@@ -339,6 +388,24 @@ PyTypeObject* py::winrt_type<py::Object>::get_python_type() noexcept
     return state->Object_type;
 }
 
+PyTypeObject* py::winrt_type<py::Array>::get_python_type() noexcept
+{
+    // borrowed ref
+    auto module = PyState_FindModule(&py::cpp::_winrt::module_def);
+
+    if (!module)
+    {
+        PyErr_SetString(PyExc_RuntimeError, "could not find _winrt module");
+        return nullptr;
+    }
+
+    auto state
+        = reinterpret_cast<py::cpp::_winrt::module_state*>(PyModule_GetState(module));
+    assert(state);
+
+    return state->Array_type;
+}
+
 PyTypeObject* py::winrt_type<py::MappingIter>::get_python_type() noexcept
 {
     // borrowed ref