libvirt-python 12.1.0__tar.gz → 12.2.0__tar.gz

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/AUTHORS

@@ -14,6 +14,7 @@ The individual contributors are
    Andrea Bolognani <abologna@redhat.com>
    Ariel Otilibili <otilibil@eurecom.fr>
    Bastian Germann <bage@linutronix.de>
+   Ben "535" Blank <ben.blank@gmail.com>
    Beraldo Leal <bleal@redhat.com>
    Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
    Brian Rak <brak@gameservers.com>
@@ -95,6 +96,7 @@ The individual contributors are
    Stefan Berger <stefanb@us.ibm.com>
    SuhailAhmedVelorum <suhailahmedvelorum@gmail.com>
    Taizo ITO <taizo.ito@hde.co.jp>
+   Takashi Kajinami <kajinamit@oss.nttdata.com>
    Taku Izumi <izumi.taku@jp.fujitsu.com>
    Tomoki Sekiyama <tomoki.sekiyama@hds.com>
    Tomáš Golembiovský <tgolembi@redhat.com>

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/ChangeLog

@@ -1,3 +1,58 @@
+ 2026- 3- 25 Ben "535" Blank <ben.blank@gmail.com>
+    
+    Emit type hints for function parameters and return values in most places.
+    
+    
+ 2026- 3- 18 Takashi Kajinami <kajinamit@oss.nttdata.com>
+    
+    Add CentOS Stream 10 job
+    CentOS Stream 10 was released some time ago. Let's add test coverage
+    with it.
+    
+    The new jobs still allow failures but may be required in the future.
+    
+    
+    
+ 2026- 3- 5 Takashi Kajinami <kajinamit@oss.nttdata.com>
+    
+    Fix outedated requirements-test.txt
+    nose was replaced by pytest long ago.
+    
+    Update tox.ini to use the file to maintain test requirements in
+    a single place.
+    
+    
+    
+ 2026- 3- 3 Daniel P. Berrangé <berrange@redhat.com>
+    
+    ensure Python.h is the first include file
+    Builds with -Werror fail with glibc 2.44 dev snapshots:
+    
+    In file included from /usr/include/python3.14/pyconfig.h:6,
+    from /usr/include/python3.14/Python.h:14,
+    from d.c:2:
+    /usr/include/python3.14/pyconfig-64.h:2007:9: warning: ‘_POSIX_C_SOURCE’ redefined
+    2007 | #define _POSIX_C_SOURCE 200809L
+    |         ^~~~~~~~~~~~~~~
+    In file included from /usr/include/bits/libc-header-start.h:33,
+    from /usr/include/stdlib.h:26,
+    from d.c:1:
+    /usr/include/features.h:319:10: note: this is the location of the previous definition
+    319 | # define _POSIX_C_SOURCE        202405L
+    |          ^~~~~~~~~~~~~~~
+    
+    The required solution is to include Python.h first, so that it owns
+    the definition of _POSIX_C_SOURCE, and thus glibc won't try to set
+    a default value
+    
+    See also: https://bugzilla.redhat.com/show_bug.cgi?id=2416110
+    
+    
+ 2026- 3- 2 Jiri Denemark <jdenemar@redhat.com>
+    
+    Post-release version bump to 12.2.0
+    
+    
  2026- 1- 29 Daniel P. Berrangé <berrange@redhat.com>
     
     rpm: remove extraneous license tag

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libvirt-python
-Version: 12.1.0
+Version: 12.2.0
 Summary: The libvirt virtualization API python binding
 Home-page: http://www.libvirt.org
 Maintainer: Libvirt Maintainers

libvirt_python-12.2.0/VERSION

@@ -0,0 +1 @@
+12.2.0

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/generator.py

@@ -230,75 +230,96 @@ skipped_types = {
 #######################################################################
 
 py_types = {
-    'void': ('', '', '', ''),
-    'int': ('i', '', "int", "int"),
-    'long': ('l', '', "long", "long"),
-    'double': ('d', '', "double", "double"),
-    'unsigned int': ('I', '', "int", "int"),
-    'unsigned long': ('l', '', "long", "long"),
-    'long long': ('L', '', "longlong", "long long"),
-    'unsigned long long': ('L', '', "longlong", "long long"),
-    'unsigned char *': ('z', '', "charPtr", "char *"),
-    'char *': ('z', '', "charPtr", "char *"),
-    'const char *': ('z', '', "constcharPtr", "const char *"),
-    'size_t': ('n', '', "size_t", "size_t"),
-
-    'virDomainPtr': ('O', "virDomain", "virDomainPtr", "virDomainPtr"),
-    'virDomain *': ('O', "virDomain", "virDomainPtr", "virDomainPtr"),
-    'const virDomain *': ('O', "virDomain", "virDomainPtr", "virDomainPtr"),
-
-    'virNetworkPtr': ('O', "virNetwork", "virNetworkPtr", "virNetworkPtr"),
-    'virNetwork *': ('O', "virNetwork", "virNetworkPtr", "virNetworkPtr"),
-    'const virNetwork *': ('O', "virNetwork", "virNetworkPtr", "virNetworkPtr"),
-
-    'virNetworkPortPtr': ('O', "virNetworkPort", "virNetworkPortPtr", "virNetworkPortPtr"),
-    'virNetworkPort *': ('O', "virNetworkPort", "virNetworkPortPtr", "virNetworkPortPtr"),
-    'const virNetworkPort *': ('O', "virNetworkPort", "virNetworkPortPtr", "virNetworkPortPtr"),
-
-    'virInterfacePtr': ('O', "virInterface", "virInterfacePtr", "virInterfacePtr"),
-    'virInterface *': ('O', "virInterface", "virInterfacePtr", "virInterfacePtr"),
-    'const virInterface *': ('O', "virInterface", "virInterfacePtr", "virInterfacePtr"),
-
-    'virStoragePoolPtr': ('O', "virStoragePool", "virStoragePoolPtr", "virStoragePoolPtr"),
-    'virStoragePool *': ('O', "virStoragePool", "virStoragePoolPtr", "virStoragePoolPtr"),
-    'const virStoragePool *': ('O', "virStoragePool", "virStoragePoolPtr", "virStoragePoolPtr"),
-
-    'virStorageVolPtr': ('O', "virStorageVol", "virStorageVolPtr", "virStorageVolPtr"),
-    'virStorageVol *': ('O', "virStorageVol", "virStorageVolPtr", "virStorageVolPtr"),
-    'const virStorageVol *': ('O', "virStorageVol", "virStorageVolPtr", "virStorageVolPtr"),
-
-    'virConnectPtr': ('O', "virConnect", "virConnectPtr", "virConnectPtr"),
-    'virConnect *': ('O', "virConnect", "virConnectPtr", "virConnectPtr"),
-    'const virConnect *': ('O', "virConnect", "virConnectPtr", "virConnectPtr"),
-
-    'virNodeDevicePtr': ('O', "virNodeDevice", "virNodeDevicePtr", "virNodeDevicePtr"),
-    'virNodeDevice *': ('O', "virNodeDevice", "virNodeDevicePtr", "virNodeDevicePtr"),
-    'const virNodeDevice *': ('O', "virNodeDevice", "virNodeDevicePtr", "virNodeDevicePtr"),
-
-    'virSecretPtr': ('O', "virSecret", "virSecretPtr", "virSecretPtr"),
-    'virSecret *': ('O', "virSecret", "virSecretPtr", "virSecretPtr"),
-    'const virSecret *': ('O', "virSecret", "virSecretPtr", "virSecretPtr"),
-
-    'virNWFilterPtr': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"),
-    'virNWFilter *': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"),
-    'const virNWFilter *': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr"),
-
-    'virNWFilterBindingPtr': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr"),
-    'virNWFilterBinding *': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr"),
-    'const virNWFilterBinding *': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr"),
-
-    'virStreamPtr': ('O', "virStream", "virStreamPtr", "virStreamPtr"),
-    'virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"),
-    'const virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr"),
-
-    'virDomainCheckpointPtr': ('O', "virDomainCheckpoint", "virDomainCheckpointPtr", "virDomainCheckpointPtr"),
-    'virDomainCheckpoint *': ('O', "virDomainCheckpoint", "virDomainCheckpointPtr", "virDomainCheckpointPtr"),
-    'const virDomainCheckpoint *': ('O', "virDomainCheckpoint", "virDomainCheckpointPtr", "virDomainCheckpointPtr"),
-
-    'virDomainSnapshotPtr': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"),
-    'virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"),
-    'const virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr"),
-}  # type: Dict[str, Tuple[str, str, str, str]]
+    'void': ('', '', '', '', 'None'),
+    'int': ('i', '', "int", "int", "int"),
+    'long': ('l', '', "long", "long", "int"),
+    'double': ('d', '', "double", "double", "float"),
+    'unsigned int': ('I', '', "int", "int", "int"),
+    'unsigned long': ('l', '', "long", "long", "int"),
+    'long long': ('L', '', "longlong", "long long", "int"),
+    'unsigned long long': ('L', '', "longlong", "long long", "int"),
+    'unsigned char *': ('z', '', "charPtr", "char *", "str"),
+    'char *': ('z', '', "charPtr", "char *", "str"),
+    'const char *': ('z', '', "constcharPtr", "const char *", "str"),
+    'size_t': ('n', '', "size_t", "size_t", "int"),
+
+    'virDomainPtr': ('O', "virDomain", "virDomainPtr", "virDomainPtr", "virDomain"),
+    'virDomain *': ('O', "virDomain", "virDomainPtr", "virDomainPtr", "virDomain"),
+    'const virDomain *': ('O', "virDomain", "virDomainPtr", "virDomainPtr", "virDomain"),
+
+    'virNetworkPtr': ('O', "virNetwork", "virNetworkPtr", "virNetworkPtr", "virNetwork"),
+    'virNetwork *': ('O', "virNetwork", "virNetworkPtr", "virNetworkPtr", "virNetwork"),
+    'const virNetwork *': ('O', "virNetwork", "virNetworkPtr", "virNetworkPtr", "virNetwork"),
+
+    'virNetworkPortPtr': ('O', "virNetworkPort", "virNetworkPortPtr", "virNetworkPortPtr", "virNetworkPort"),
+    'virNetworkPort *': ('O', "virNetworkPort", "virNetworkPortPtr", "virNetworkPortPtr", "virNetworkPort"),
+    'const virNetworkPort *': ('O', "virNetworkPort", "virNetworkPortPtr", "virNetworkPortPtr", "virNetworkPort"),
+
+    'virInterfacePtr': ('O', "virInterface", "virInterfacePtr", "virInterfacePtr", "virInterface"),
+    'virInterface *': ('O', "virInterface", "virInterfacePtr", "virInterfacePtr", "virInterface"),
+    'const virInterface *': ('O', "virInterface", "virInterfacePtr", "virInterfacePtr", "virInterface"),
+
+    'virStoragePoolPtr': ('O', "virStoragePool", "virStoragePoolPtr", "virStoragePoolPtr", "virStoragePool"),
+    'virStoragePool *': ('O', "virStoragePool", "virStoragePoolPtr", "virStoragePoolPtr", "virStoragePool"),
+    'const virStoragePool *': ('O', "virStoragePool", "virStoragePoolPtr", "virStoragePoolPtr", "virStoragePool"),
+
+    'virStorageVolPtr': ('O', "virStorageVol", "virStorageVolPtr", "virStorageVolPtr", "virStorageVol"),
+    'virStorageVol *': ('O', "virStorageVol", "virStorageVolPtr", "virStorageVolPtr", "virStorageVol"),
+    'const virStorageVol *': ('O', "virStorageVol", "virStorageVolPtr", "virStorageVolPtr", "virStorageVol"),
+
+    'virConnectPtr': ('O', "virConnect", "virConnectPtr", "virConnectPtr", "virConnect"),
+    'virConnect *': ('O', "virConnect", "virConnectPtr", "virConnectPtr", "virConnect"),
+    'const virConnect *': ('O', "virConnect", "virConnectPtr", "virConnectPtr", "virConnect"),
+
+    'virNodeDevicePtr': ('O', "virNodeDevice", "virNodeDevicePtr", "virNodeDevicePtr", "virNodeDevice"),
+    'virNodeDevice *': ('O', "virNodeDevice", "virNodeDevicePtr", "virNodeDevicePtr", "virNodeDevice"),
+    'const virNodeDevice *': ('O', "virNodeDevice", "virNodeDevicePtr", "virNodeDevicePtr", "virNodeDevice"),
+
+    'virSecretPtr': ('O', "virSecret", "virSecretPtr", "virSecretPtr", "virSecret"),
+    'virSecret *': ('O', "virSecret", "virSecretPtr", "virSecretPtr", "virSecret"),
+    'const virSecret *': ('O', "virSecret", "virSecretPtr", "virSecretPtr", "virSecret"),
+
+    'virNWFilterPtr': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr", "virNWFilter"),
+    'virNWFilter *': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr", "virNWFilter"),
+    'const virNWFilter *': ('O', "virNWFilter", "virNWFilterPtr", "virNWFilterPtr", "virNWFilter"),
+
+    'virNWFilterBindingPtr': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr", "virNWFilterBinding"),
+    'virNWFilterBinding *': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr", "virNWFilterBinding"),
+    'const virNWFilterBinding *': ('O', "virNWFilterBinding", "virNWFilterBindingPtr", "virNWFilterBindingPtr", "virNWFilterBinding"),
+
+    'virStreamPtr': ('O', "virStream", "virStreamPtr", "virStreamPtr", "virStream"),
+    'virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr", "virStream"),
+    'const virStream *': ('O', "virStream", "virStreamPtr", "virStreamPtr", "virStream"),
+
+    'virDomainCheckpointPtr': ('O', "virDomainCheckpoint", "virDomainCheckpointPtr", "virDomainCheckpointPtr", "virDomainCheckpoint"),
+    'virDomainCheckpoint *': ('O', "virDomainCheckpoint", "virDomainCheckpointPtr", "virDomainCheckpointPtr", "virDomainCheckpoint"),
+    'const virDomainCheckpoint *': ('O', "virDomainCheckpoint", "virDomainCheckpointPtr", "virDomainCheckpointPtr", "virDomainCheckpoint"),
+
+    'virDomainSnapshotPtr': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr", "virDomainSnapshot"),
+    'virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr", "virDomainSnapshot"),
+    'const virDomainSnapshot *': ('O', "virDomainSnapshot", "virDomainSnapshotPtr", "virDomainSnapshotPtr", "virDomainSnapshot"),
+}  # type: Dict[str, Tuple[str, str, str, str, str]]
+
+
+# These C types are used only in generated Python code, so don't need the
+# C-supporting elements from py_types.
+py_types_only = {
+    'bool': "bool",
+    'const unsigned char *': "str",
+    'const char **': "List[str]",
+    'unsigned int *': "List[int]",
+    'virErrorPtr': "_RawError",
+    'virEventAddHandleFunc': "_EventAddHandleFunc[_T]",
+    'virEventUpdateHandleFunc': "_EventUpdateHandleFunc",
+    'virEventRemoveHandleFunc': "_EventRemoveHandleFunc",
+    'virEventAddTimeoutFunc': "_EventAddTimeoutFunc[_T]",
+    'virEventUpdateTimeoutFunc': "_EventUpdateTimeoutFunc",
+    'virEventRemoveTimeoutFunc': "_EventRemoveTimeoutFunc",
+    'virBlkioParameterPtr': "_BlkioParameter",
+    'virMemoryParameterPtr': "_MemoryParameter",
+    'virSchedParameterPtr': "_SchedParameter",
+    'virTypedParameterPtr': "_TypedParameter",
+}  # type: Dict[str, str]
 
 
 #######################################################################
@@ -712,7 +733,7 @@ def print_function_wrapper(package: str, name: str, output: IO[str], export: IO[
             a_type = a_type[6:]
         c_args += "    %s %s;\n" % (a_type, a_name)
         if a_type in py_types:
-            (f, t, n, c) = py_types[a_type]
+            (f, t, n, c, p) = py_types[a_type]
             if f:
                 format += f
             if t:
@@ -750,7 +771,7 @@ def print_function_wrapper(package: str, name: str, output: IO[str], export: IO[
             c_call = "\n    %s(%s);\n" % (name, c_call)
         ret_convert = "    Py_INCREF(Py_None);\n    return Py_None;\n"
     elif r_type in py_types:
-        (f, t, n, c) = py_types[r_type]
+        (f, t, n, c, p) = py_types[r_type]
         c_return = "    %s c_retval;\n" % (r_type)
         if file == "python_accessor" and r_field:
             c_call = "\n    c_retval = %s->%s;\n" % (args[0][0], r_field)
@@ -858,7 +879,7 @@ def load_apis(module: str, api_xml: str):
         print("Found %d functions in %s" % ((n), api_xml))
 
     override_api_xml = "%s-override-api.xml" % module
-    py_types['pythonObject'] = ('O', "pythonObject", "pythonObject", "pythonObject")
+    py_types['pythonObject'] = ('O', "pythonObject", "pythonObject", "pythonObject", "object")
 
     try:
         onlyOverrides = True
@@ -890,8 +911,8 @@ def emit_c_code(module: str) -> None:
 
     wrapper = open(wrapper_file, "w")
     wrapper.write("/* Generated by generator.py */\n\n")
-    wrapper.write("#include <stdlib.h>\n")
     wrapper.write("#include <Python.h>\n")
+    wrapper.write("#include <stdlib.h>\n")
     wrapper.write("#include <libvirt/%s.h>\n" % (module,))
     wrapper.write("#include \"typewrappers.h\"\n")
     wrapper.write("#include \"%s.h\"\n\n" % (module))
@@ -1366,6 +1387,9 @@ def emit_py_code(module: str) -> None:
     if extra:
         extra.close()
 
+    types_map = {name: types[-1] for name, types in py_types.items()}
+    types_map.update(py_types_only)
+
     if "None" in function_classes:
         flist = function_classes["None"]
         oldfile = ""
@@ -1378,12 +1402,18 @@ def emit_py_code(module: str) -> None:
                 if n != 0:
                     classes.write(", ")
                 classes.write("%s" % a_name)
+                if a_type in types_map:
+                    classes.write(": \"%s\"" % types_map[a_type])
                 if a_name == "flags" or is_optional_arg(a_info):
                     if is_integral_type(a_type):
                         classes.write("=0")
                     else:
                         classes.write("=None")
-            classes.write("):\n")
+            r_type, r_info, r_field = ret
+            classes.write(")")
+            if r_type in types_map:
+                classes.write(" -> \"%s\"" % types_map[r_type])
+            classes.write(":\n")
             writeDoc(module, name, args, '    ', classes)
 
             for a_name, a_type, a_info in args:
@@ -1395,7 +1425,6 @@ def emit_py_code(module: str) -> None:
                                   "        %s__o = %s%s\n" %
                                   (a_name, a_name, classes_type[a_type][0]))
 
-            r_type, r_info, r_field = ret
             if r_type != "void":
                 classes.write("    ret = ")
             else:
@@ -1477,18 +1506,18 @@ def emit_py_code(module: str) -> None:
             if classname in ["virDomain", "virNetwork", "virInterface", "virStoragePool",
                              "virStorageVol", "virNodeDevice", "virSecret", "virStream",
                              "virNWFilter", "virNWFilterBinding"]:
-                classes.write("    def __init__(self, conn, _obj=None):\n")
+                classes.write("    def __init__(self, conn: \"virConnect\", _obj: object=None):\n")
                 classes.write("        self._conn = conn\n")
             elif classname in ["virDomainCheckpoint", "virDomainSnapshot"]:
-                classes.write("    def __init__(self, dom, _obj=None):\n")
+                classes.write("    def __init__(self, dom: \"virDomain\", _obj: object=None):\n")
                 classes.write("        self._dom = dom\n")
                 classes.write("        self._conn = dom.connect()\n")
             elif classname in ["virNetworkPort"]:
-                classes.write("    def __init__(self, net, _obj=None) -> None:\n")
+                classes.write("    def __init__(self, net: \"virNetwork\", _obj: object=None) -> None:\n")
                 classes.write("        self._net = net\n")
                 classes.write("        self._conn = net.connect()\n")
             else:
-                classes.write("    def __init__(self, _obj=None):\n")
+                classes.write("    def __init__(self, _obj: object=None):\n")
 
             classes.write("        if type(_obj).__name__ not in [\"PyCapsule\", \"PyCObject\"]:\n")
             classes.write("            raise Exception(\"Expected a wrapped C Object but got %s\" % type(_obj))\n")
@@ -1515,7 +1544,7 @@ def emit_py_code(module: str) -> None:
                 classes.write("    def network(self):\n")
                 classes.write("        return self._net\n\n")
 
-            classes.write("    def c_pointer(self):\n")
+            classes.write("    def c_pointer(self) -> object:\n")
             classes.write("        \"\"\"Get C pointer to underlying object\"\"\"\n")
             classes.write("        return %s.%s_pointer(self._o)\n\n" %
                           (pymod, classname))
@@ -1542,12 +1571,18 @@ def emit_py_code(module: str) -> None:
                 for n, (a_name, a_type, a_info) in enumerate(args):
                     if n != index:
                         classes.write(", %s" % a_name)
+                        if a_type in types_map:
+                            classes.write(": \"%s\"" % types_map[a_type])
                     if a_name == "flags" or is_optional_arg(a_info):
                         if is_integral_type(a_type):
                             classes.write("=0")
                         else:
                             classes.write("=None")
-                classes.write("):\n")
+                r_type, r_info, r_field = ret
+                classes.write(")")
+                if r_type in types_map:
+                    classes.write(" -> \"%s\"" % types_map[r_type])
+                classes.write(":\n")
                 writeDoc(module, name, args, '        ', classes)
                 for n, (a_name, a_type, a_info) in enumerate(args):
                     if a_type in classes_type:
@@ -1558,7 +1593,6 @@ def emit_py_code(module: str) -> None:
                             classes.write("        else:\n"
                                           "            %s__o = %s%s\n" %
                                           (a_name, a_name, classes_type[a_type][0]))
-                r_type, r_info, r_field = ret
                 if r_type != "void":
                     classes.write("        ret = ")
                 else:
@@ -1701,10 +1735,15 @@ def emit_py_code(module: str) -> None:
             if n != 0:
                 classes.write(", ")
             classes.write("%s" % a_name)
-        classes.write("):\n")
+            if a_type in types_map:
+                classes.write(": \"%s\"" % types_map[a_type])
+        r_type, r_info, r_field = ret
+        classes.write(")")
+        if r_type in types_map:
+            classes.write(" -> \"%s\"" % types_map[r_type])
+        classes.write(":\n")
         writeDoc(module, name, args, '    ', classes)
 
-        r_type, r_info, r_field = ret
         if r_type != "void":
             classes.write("    ret = ")
         else:

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/libvirt-override-virConnect.py

@@ -16,7 +16,7 @@
     def __exit__(self, exc_type_: Optional[Type[BaseException]], exc_value_: Optional[BaseException], traceback_: Optional[TracebackType]) -> None:
         self.close()
 
-    def domainEventDeregister(self, cb: _DomainCB) -> None:
+    def domainEventDeregister(self, cb: _DomainCB[_T]) -> None:
         """Removes a Domain Event Callback. De-registering for a
            domain callback will disable delivery of this event type """
         try:
@@ -29,13 +29,13 @@
         except AttributeError:
             pass
 
-    def domainEventRegister(self, cb: _DomainCB, opaque: _T) -> None:
+    def domainEventRegister(self, cb: _DomainCB[_T], opaque: _T) -> None:
         """Adds a Domain Event Callback. Registering for a domain
            callback will enable delivery of the events """
         try:
             self.domainEventCallbacks[cb] = opaque
         except AttributeError:
-            self.domainEventCallbacks = {cb: opaque}  # type: Dict[_DomainCB, _T]
+            self.domainEventCallbacks = {cb: opaque}  # type: Dict[_DomainCB[_T], _T]
             ret = libvirtmod.virConnectDomainEventRegister(self._o, self)
             if ret == -1:
                 raise libvirtError('virConnectDomainEventRegister() failed')
@@ -572,7 +572,7 @@
         if ret == -1:
             raise libvirtError('virConnectUnregisterCloseCallback() failed')
 
-    def registerCloseCallback(self, cb: Callable, opaque: _T) -> int:
+    def registerCloseCallback(self, cb: Callable[['virConnect', int, _T], None], opaque: _T) -> int:
         """Adds a close event callback, providing a notification
          when a connection fails / closes"""
         cbData = {"cb": cb, "conn": self, "opaque": opaque}

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/libvirt-override.py

@@ -3,11 +3,11 @@ from types import TracebackType
 from typing import Any, Callable, Dict, List, Optional, overload, Tuple, Type, TypeVar, Union
 _T = TypeVar('_T')
 _EventCB = Callable[[int, int, int, _T], None]
-_EventAddHandleFunc = Callable[[int, int, _EventCB, _T], int]
+_EventAddHandleFunc = Callable[[int, int, _EventCB[_T], _T], int]
 _EventUpdateHandleFunc = Callable[[int, int], None]
 _EventRemoveHandleFunc = Callable[[int], int]
 _TimerCB = Callable[[int, _T], None]
-_EventAddTimeoutFunc = Callable[[int, _TimerCB, _T], int]
+_EventAddTimeoutFunc = Callable[[int, _TimerCB[_T], _T], int]
 _EventUpdateTimeoutFunc = Callable[[int, int], None]
 _EventRemoveTimeoutFunc = Callable[[int], int]
 _DomainCB = Callable[['virConnect', 'virDomain', int, int, _T], Optional[int]]
@@ -15,6 +15,7 @@ _BlkioParameter = Dict[str, Any]
 _MemoryParameter = Dict[str, Any]
 _SchedParameter = Dict[str, Any]
 _TypedParameter = Dict[str, Any]
+_RawError = Tuple[int, int, str, int, str, Optional[str], Optional[str], int, int]
 
 
 # The root of all libvirt errors.
@@ -23,7 +24,7 @@ class libvirtError(Exception):
 
         # Never call virConnGetLastError().
         # virGetLastError() is now thread local
-        err = libvirtmod.virGetLastError()  # type: Optional[Tuple[int, int, str, int, str, Optional[str], Optional[str], int, int]]
+        err = libvirtmod.virGetLastError()  # type: Optional[_RawError]
         if err is None:
             msg = defmsg
         else:
@@ -82,7 +83,7 @@ class libvirtError(Exception):
 #
 # register the libvirt global error handler
 #
-def registerErrorHandler(f: Callable[[_T, List], None], ctx: _T) -> int:
+def registerErrorHandler(f: Callable[[_T, _RawError], None], ctx: _T) -> int:
     """Register a Python function for error reporting.
        The function is called back as f(ctx, error), with error
        being a list of information about the error being raised.
@@ -153,10 +154,10 @@ def getVersion(name: Optional[str] = None) -> int:
 # Invoke an EventHandle callback
 #
 @overload
-def _eventInvokeHandleCallback(watch: int, fd: int, event: int, opaque: Tuple[_EventCB, _T], opaquecompat: None = None) -> None: ...  # noqa E704
+def _eventInvokeHandleCallback(watch: int, fd: int, event: int, opaque: Tuple[_EventCB[_T], _T], opaquecompat: None = None) -> None: ...  # noqa E704
 @overload  # noqa F811
-def _eventInvokeHandleCallback(watch: int, fd: int, event: int, opaque: _EventCB, opaquecompat: _T = None) -> None: ...  # noqa E704
-def _eventInvokeHandleCallback(watch: int, fd: int, event: int, opaque: Union[Tuple[_EventCB, _T], _EventCB], opaquecompat: Optional[_T] = None) -> None:  # noqa F811
+def _eventInvokeHandleCallback(watch: int, fd: int, event: int, opaque: _EventCB[_T], opaquecompat: _T = None) -> None: ...  # noqa E704
+def _eventInvokeHandleCallback(watch: int, fd: int, event: int, opaque: Union[Tuple[_EventCB[_T], _T], _EventCB[_T]], opaquecompat: Optional[_T] = None) -> None:  # noqa F811
     """
     Invoke the Event Impl Handle Callback in C
     """
@@ -178,7 +179,7 @@ def _eventInvokeHandleCallback(watch: int, fd: int, event: int, opaque: Union[Tu
 #
 # Invoke an EventTimeout callback
 #
-def _eventInvokeTimeoutCallback(timer: int, opaque: Union[Tuple[_TimerCB, _T], _TimerCB], opaquecompat: Optional[_T] = None) -> None:
+def _eventInvokeTimeoutCallback(timer: int, opaque: Union[Tuple[_TimerCB[_T], _T], _TimerCB[_T]], opaquecompat: Optional[_T] = None) -> None:
     """
     Invoke the Event Impl Timeout Callback in C
     """
@@ -213,7 +214,7 @@ def _dispatchEventTimeoutCallback(timer: int, cbData: Dict[str, Any]) -> int:
     return 0
 
 
-def virEventAddHandle(fd: int, events: int, cb: _EventCB, opaque: _T) -> int:
+def virEventAddHandle(fd: int, events: int, cb: _EventCB[_T], opaque: _T) -> int:
     """
     register a callback for monitoring file handle events
 
@@ -235,7 +236,7 @@ def virEventAddHandle(fd: int, events: int, cb: _EventCB, opaque: _T) -> int:
     return ret
 
 
-def virEventAddTimeout(timeout: int, cb: _TimerCB, opaque: _T) -> int:
+def virEventAddTimeout(timeout: int, cb: _TimerCB[_T], opaque: _T) -> int:
     """
     register a callback for a timer event
 

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/libvirt-python.spec

@@ -16,7 +16,7 @@
 
 Summary: The libvirt virtualization API python3 binding
 Name: libvirt-python
-Version: 12.1.0
+Version: 12.2.0
 Release: 1%{?dist}
 Source0: https://libvirt.org/sources/python/%{dist_name}-%{version}.tar.gz
 Url: https://libvirt.org

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/libvirtaio.py

@@ -418,7 +418,7 @@ class virEventAsyncIOImpl(object):
         callback.close()
         return 0
 
-    def _add_timeout(self, timeout: int, cb: libvirt._TimerCB, opaque: _T) -> int:
+    def _add_timeout(self, timeout: int, cb: libvirt._TimerCB[_T], opaque: _T) -> int:
         '''Register a callback for a timer event
 
         :param int timeout: the timeout to monitor

libvirt_python-12.2.0/requirements-test.txt

@@ -0,0 +1,2 @@
+pytest
+lxml

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/tests/eventmock.py

@@ -12,7 +12,7 @@ _remove_timeout_impl = None
 
 _registered = False
 
-def _add_handle(fd: int, event: int, cb: libvirt._EventCB, opaque: libvirt._T) -> int:
+def _add_handle(fd: int, event: int, cb: libvirt._EventCB[libvirt._T], opaque: libvirt._T) -> int:
     global _add_handle_impl
     assert _add_handle_impl != None
     return _add_handle_impl(fd, event, cb, opaque)
@@ -27,7 +27,7 @@ def _remove_handle(watch: int) -> int:
     assert _remove_handle_impl != None
     return _remove_handle_impl(watch)
 
-def _add_timeout(timeout: int, cb: libvirt._TimerCB, opaque: libvirt._T) -> int:
+def _add_timeout(timeout: int, cb: libvirt._TimerCB[libvirt._T], opaque: libvirt._T) -> int:
     global _add_timeout_impl
     assert _add_timeout_impl != None
     return _add_timeout_impl(timeout, cb, opaque)

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/tox.ini

@@ -3,7 +3,6 @@ envlist = py39,py310,py311,py312,py313
 
 [testenv]
 deps=
-    lxml
-    pytest
+    -r{toxinidir}/requirements-test.txt
 commands=
     pytest

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/typewrappers.c

@@ -12,6 +12,7 @@
  * which has over 180 autoconf-style HAVE_* definitions.  Shame on them.  */
 #undef HAVE_PTHREAD_H
 
+#include <Python.h>
 #include <stdio.h>
 #include <string.h>
 #include "typewrappers.h"

libvirt_python-12.1.0/VERSION

@@ -1 +0,0 @@
-12.1.0

libvirt_python-12.1.0/requirements-test.txt

@@ -1,2 +0,0 @@
-nose
-lxml

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/libvirt-override.c

@@ -19,9 +19,9 @@
 
 #define PY_SSIZE_T_CLEAN
 
+#include <Python.h>
 #include <stdio.h>
 #include <string.h>
-#include <Python.h>
 #include <libvirt/libvirt.h>
 #include <libvirt/virterror.h>
 #include <stddef.h>

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/libvirt-qemu-override.c

@@ -14,8 +14,8 @@
    which has over 180 autoconf-style HAVE_* definitions.  Shame on them.  */
 #undef HAVE_PTHREAD_H
 
-#include <stdio.h>
 #include <Python.h>
+#include <stdio.h>
 #include <libvirt/libvirt-qemu.h>
 #include <libvirt/virterror.h>
 #include "typewrappers.h"

{libvirt_python-12.1.0 → libvirt_python-12.2.0}/libvirt-utils.c

@@ -19,10 +19,10 @@
  *
  */
 
-#include <string.h>
-
 #include <Python.h>
 
+#include <string.h>
+
 /* Ugly python defines that, which is also defined in errno.h */
 #undef _POSIC_C_SOURCE