generate code from PyWinRT v1.0.0-beta.4

Author: dlech

CHANGELOG.md

@@ -1,6 +1,6 @@
 param ([switch]$skipNugetInstall)
 
-$pywinrt_version = '1.0.0-beta.3'
+$pywinrt_version = '1.0.0-beta.4'
 $cppwinrt_version = '2.0.220110.5'
 $windows_sdk_version = '10.0.22000.0'
 $repoRootPath = (Get-Item $PSScriptRoot).FullName

generate.ps1

@@ -1,4 +1,4 @@
-# WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.3
+# WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.4
 
 from . import _winrt
 
@@ -7,7 +7,7 @@ def _import_ns_module(ns):
     import importlib.util
 
     try:
-        module_name = "_winsdk_" + ns.replace('.', '_')
+        module_name = f"_winsdk_{ns.replace('.', '_')}"
 
         loader = importlib.machinery.ExtensionFileLoader(module_name, _winrt.__file__)
         spec = importlib.util.spec_from_loader(module_name, loader)

pywinrt/winsdk/__init__.py

@@ -1,7 +1,8 @@
-# WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.3
+# WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.4
 
 
 import sys
+from typing import Iterable, Optional
 
 if sys.version_info >= (3, 9):
     from typing import Annotated
@@ -40,4 +41,5 @@ def uninit_apartment() -> None: ...
 def initialize_with_window(obj: Object, hwnd: int) -> None: ...
 
 class Object:
-    ...
+    @classmethod
+    def __init_subclass__(cls, /, interfaces: Optional[Iterable[type]] = None, **kwargs) -> None: ...

pywinrt/winsdk/_winrt.pyi

@@ -1,36 +1,37 @@
-// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.3
+// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.4
 
 #include "pybase.h"
 #include <Shobjidl.h>
 #include <winrt/base.h>
 
-PyObject* create_python_type(PyType_Spec* type_spec, PyObject* base_type) noexcept
-{
-    if (base_type != nullptr)
-    {
-        return PyType_FromSpecWithBases(type_spec, base_type);
-    }
-    else
-    {
-        return PyType_FromSpec(type_spec);
-    }
-}
-
+/**
+ * Adds a Python type to a Python module.
+ *
+ * @param module The module to add the type to.
+ * @param type_name A valid Python identifier.
+ * @param type_spec The Python type spec.
+ * @param base_type The base type, a tuple of base types or nullptr to use the base
+ * slot.
+ * @returns A new reference to the type object or nullptr on error.
+ */
 PyTypeObject* py::register_python_type(
     PyObject* module,
     const char* const type_name,
     PyType_Spec* type_spec,
-    PyObject* base_type)
+    PyObject* base_type) noexcept
 {
-    py::pyobj_handle type_object{create_python_type(type_spec, base_type)};
+    py::pyobj_handle type_object{PyType_FromSpecWithBases(type_spec, base_type)};
+
     if (!type_object)
     {
-        throw winrt::hresult_error();
+        return nullptr;
     }
-    if (PyModule_AddObject(module, type_name, type_object.get()) != 0)
+
+    if (PyModule_AddObject(module, type_name, type_object.get()) == -1)
     {
-        throw winrt::hresult_error();
+        return nullptr;
     }
+
     return reinterpret_cast<PyTypeObject*>(type_object.detach());
 }
 
@@ -180,6 +181,11 @@ static int module_exec(PyObject* module) noexcept
         py::winrt_type<py::Object>::python_type = py::register_python_type(
             module, _type_name_Object, &Object_type_spec, nullptr);
 
+        if (!py::winrt_type<py::Object>::python_type)
+        {
+            return -1;
+        }
+
         if (PyModule_AddIntConstant(module, "MTA", kMTA) == -1)
         {
             return -1;

pywinrt/winsdk/src/_winrt.cpp

@@ -1,4 +1,4 @@
-// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.3
+// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.4
 
 #include "pybase.h"
 #include "py.Windows.AI.MachineLearning.Preview.h"

pywinrt/winsdk/src/py.Windows.AI.MachineLearning.Preview.cpp

@@ -1,4 +1,4 @@
-// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.3
+// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.4
 
 #pragma once
 

pywinrt/winsdk/src/py.Windows.AI.MachineLearning.Preview.h

@@ -1,4 +1,4 @@
-// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.3
+// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.4
 
 #include "pybase.h"
 #include "py.Windows.AI.MachineLearning.h"

pywinrt/winsdk/src/py.Windows.AI.MachineLearning.cpp

@@ -1,4 +1,4 @@
-// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.3
+// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.4
 
 #pragma once
 

pywinrt/winsdk/src/py.Windows.AI.MachineLearning.h

@@ -1,4 +1,4 @@
-// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.3
+// WARNING: Please don't edit this file. It was generated by Python/WinRT v1.0.0-beta.4
 
 #include "pybase.h"
 #include "py.Windows.ApplicationModel.Activation.h"