libvirt-python 12.4.0__tar.gz → 12.6.0__tar.gz

{libvirt_python-12.4.0 → libvirt_python-12.6.0}/AUTHORS

@@ -87,6 +87,7 @@ The individual contributors are
    Prabodh Agarwal <prabodh1194@users.noreply.github.com>
    Pradipta Kr. Banerjee <pradipta.banerjee@gmail.com>
    Qiaowei Ren <qiaowei.ren@intel.com>
+   Radoslaw Smigielski <rsmigiel@redhat.com>
    Radostin Stoyanov <rstoyanov@fedoraproject.org>
    renlei4 <ren.lei4@zte.com.cn>
    Richard W.M. Jones <rjones@redhat.com>

{libvirt_python-12.4.0 → libvirt_python-12.6.0}/ChangeLog

@@ -1,3 +1,196 @@
+ 2026- 7- 28 Daniel P. Berrangé <berrange@redhat.com>
+    
+    Use lowercase types for collection types
+    The uppercase aliases were deprecated since Py 3.9
+    
+    https://docs.python.org/3/library/typing.html#deprecated-aliases
+    
+    
+    
+ 2026- 7- 28 Daniel P. Berrangé <berrange@redhat.com>
+    
+    ci: refresh with lcitool manifest
+    This replaces OpenSUSE 15 with 16, since 15.6 is now end of life
+    
+    
+    
+ 2026- 7- 28 Daniel P. Berrangé <berrange@redhat.com>
+    
+    Remove redundant return type annotation
+    The _timer() method does not return any value, so declaring its
+    return type is incorrect.
+    
+    
+    
+ 2026- 7- 28 Daniel P. Berrangé <berrange@redhat.com>
+    
+    Use qualified classname for types in libvirt_qemu/libvirt_lxc
+    We must use "libvirt.virDomain" in the type annotation, not a plain
+    "virDomain".
+    
+    
+    
+ 2026- 7- 28 Daniel P. Berrangé <berrange@redhat.com>
+    
+    Check for stream 'cb' attribute existance
+    Instead of accessing self.cb and catching the exception when it does not
+    exist, check for it upfront, which makes mypy happier.
+    
+    
+    
+ 2026- 7- 28 Daniel P. Berrangé <berrange@redhat.com>
+    
+    Fix type for multi-valued return
+    
+    
+ 2026- 7- 28 Daniel P. Berrangé <berrange@redhat.com>
+    
+    Stop scoping the domain event callback type
+    This leads to incompatible types between the register and deregister
+    methods:
+    
+    "Callable[[virConnect, virDomain, int, int, _T@domainEventDeregister], int | None]"
+    "Callable[[virConnect, virDomain, int, int, _T@domainEventRegister], int | None]"
+    
+    
+    
+ 2026- 7- 28 Daniel P. Berrangé <berrange@redhat.com>
+    
+    Use Optiona[..] type annotation for all params with default values
+    If a parameter has a default value assigned then by definition it is
+    an optional parameter, and the type must reflect that.
+    
+    
+    
+ 2026- 7- 28 Daniel P. Berrangé <berrange@redhat.com>
+    
+    Use 'bytes' not 'str' for 'unsigned char *' parameters
+    Such parameters are all byte arrays, not NUL terminated C strings.
+    
+    
+    
+ 2026- 7- 28 Daniel P. Berrangé <berrange@redhat.com>
+    
+    Fix override type for virNodeListDevices 'caps' parameter
+    The 'caps' parameter is a string capability name, not a set of
+    bytes.
+    
+    
+    
+ 2026- 7- 20 Radoslaw Smigielski <rsmigiel@redhat.com>
+    
+    tests: add comprehensive domain configuration tests
+    Add few new tests in test_domain_config.py covering domain attributes,
+    autostart, scheduler parameters, memory, vCPUs, block/network stats,
+    CPU stats, suspend/resume, metadata, blkio and NUMA parameters.
+    
+    
+    
+ 2026- 7- 10 Radoslaw Smigielski <rsmigiel@redhat.com>
+    
+    tests: add few new tests for domain lifecycle operations
+    Add new test file test_domain_lifecycle.py with 30 functional tests
+    covering domain lifecycle operations. This significantly expands test
+    coverage beyond the existing 2 basic tests in test_domain.py.
+    
+    All new tests use the test:///default driver.
+    
+    These tests verify that Python bindings work correctly with various
+    parameters and edge cases, not only that the bindings exist.
+    
+    
+    
+ 2026- 7- 9 Radoslaw Smigielski <rsmigiel@redhat.com>
+    
+    tests: run tox tests in parallel
+    Use `tox run-parallel` instead of `tox` in the test target so all
+    Python versions are exercised concurrently.
+    And significantly reduces tox execution time.
+    
+    
+    
+ 2026- 7- 8 Radoslaw Smigielski <rsmigiel@redhat.com>
+    
+    docs: add explicit install instructions for pytest and tox in README
+    Add dnf and pip install commands for both pytest and tox to the testing
+    section of the README, making it clear how to obtain the required tools
+    before running the test suite.
+    
+    
+    
+ 2026- 7- 8 Jiri Denemark <jdenemar@redhat.com>
+    
+    Post-release version bump to 12.6.0
+    
+    
+ 2026- 7- 8 Radoslaw Smigielski <rsmigiel@redhat.com>
+    
+    python: Add support for free-threaded no-GIL CPython
+    This is an initial commit to add support for:
+    - Python 3.13 (python3.13t)
+    - Python 3.14 (python3.14t)
+    
+    Both python3.13t and python3.14t do not support the Stable C API,
+    so the only way to get libvirt-python working with no-GIL Python
+    is to fall back to the Python Unstable C API. This is the approach
+    taken in this change.
+    
+    As the Python community plans to add Stable C API support in Python
+    3.15+, we can switch back to it from 3.15 onwards. However, for
+    3.13 and 3.14, we must use the Unstable C API.
+    (Ref: https://docs.python.org/3/c-api/unstable.html)
+    
+    Following PEP 703 (https://peps.python.org/pep-0703/):
+    
+    1. Add dedicated tox envs: py313t, py314t.
+    2. Create dedicated env configurations for new environments.
+    This forces no-GIL execution in case any dependency tries to
+    silently turn the GIL back on.
+    
+    [testenv:py313t] with basepython = python3.13t
+    [testenv:py314t] with basepython = python3.14t
+    
+    3. Explicitly use the free-threaded interpreters and only set
+    PYTHON_GIL=0 inside the virtualenv.
+    4. Add documentation warning against exporting PYTHON_GIL=0 in the
+    shell before running tox. Doing so affects the Python instance
+    that launches tox itself, not just the test venv.
+    
+    Fixes: https://gitlab.com/libvirt/libvirt-python/-/work_items/22
+    
+    
+ 2026- 7- 3 Radoslaw Smigielski <rsmigiel@redhat.com>
+    
+    tests: add Python 3.14 to tox test environments
+    Add py314 to the envlist to support testing with Python 3.14.
+    
+    
+    
+ 2026- 7- 2 Radoslaw Smigielski <rsmigiel@redhat.com>
+    
+    docs: clarify build and test dependencies in README
+    Add missing installation instructions for required dependencies:
+    
+    - Document that the Python 'build' module must be installed before
+    running 'python3 -m build', with examples using both dnf and pip
+    - Add instruction to install test dependencies from requirements-test.txt
+    before running pytest or tox
+    
+    These additions help new contributors avoid common setup errors when
+    building and testing the libvirt Python bindings.
+    
+    
+    
+ 2026- 6- 9 Michal Privoznik <mprivozn@redhat.com>
+    
+    Add support for virDomainAnnounceInterface() API
+    
+    
+ 2026- 6- 1 Jiri Denemark <jdenemar@redhat.com>
+    
+    Post-release version bump to 12.5.0
+    
+    
  2026- 5- 25 Michal Privoznik <mprivozn@redhat.com>
     
     Add support for domain channel lifecycle event

{libvirt_python-12.4.0 → libvirt_python-12.6.0}/Makefile

@@ -16,7 +16,7 @@ check: all
 	tox -e py$(VERSION)
 
 test: all
-	tox
+	tox run-parallel
 
 rpm: all
 	rpmbuild -ta dist/libvirt[-_]python-$(shell tr -d '\n' < VERSION).tar.gz

{libvirt_python-12.4.0 → libvirt_python-12.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libvirt-python
-Version: 12.4.0
+Version: 12.6.0
 Summary: The libvirt virtualization API python binding
 Home-page: http://www.libvirt.org
 Maintainer: Libvirt Maintainers
@@ -36,6 +36,14 @@ Requirements
 To build the libvirt python binary requires the GCC and pkg-config
 tools, and development headers for the libvirt and python libraries.
 
+Additionally, the Python build module is required and can be installed via:
+
+  $ dnf install python3-build
+
+or
+
+  $ python3 -m pip install --user build
+
 Building and installing
 -----------------------
 
@@ -54,8 +62,29 @@ without explicit building.
 In order to test the package, you'll need either tox or at least pytest,
 depending on whether you want to test an already installed package in which
 case the latter is sufficient or if you wish to test in a virtual
-environment you'd need tox. Depending on your preferred setup, you can run the
-tests either as
+environment you'd need tox.
+
+To install pytest, use one of:
+
+  $ dnf install python3-pytest
+
+or
+
+  $ python3 -m pip install --user pytest
+
+To install tox, use one of:
+
+  $ dnf install python3-tox
+
+or
+
+  $ python3 -m pip install --user tox
+
+Additionally, install the remaining test dependencies:
+
+  $ python3 -m pip install -r requirements-test.txt
+
+Depending on your preferred setup, you can run the tests either as
 
   $ python3 -m pytest
 
@@ -63,6 +92,10 @@ or as
 
   $ tox
 
+Free-threaded Python (py313t, py314t) test environments require tox>=4.26
+and the corresponding free-threaded interpreters (python3.13t, python3.14t)
+to be installed.
+
 A makefile shim is also provided for your convenience, so that you don't have
 to care about the exact operations mentioned above and instead you simply do
 

{libvirt_python-12.4.0 → libvirt_python-12.6.0}/README

@@ -20,6 +20,14 @@ Requirements
 To build the libvirt python binary requires the GCC and pkg-config
 tools, and development headers for the libvirt and python libraries.
 
+Additionally, the Python build module is required and can be installed via:
+
+  $ dnf install python3-build
+
+or
+
+  $ python3 -m pip install --user build
+
 Building and installing
 -----------------------
 
@@ -38,8 +46,29 @@ without explicit building.
 In order to test the package, you'll need either tox or at least pytest,
 depending on whether you want to test an already installed package in which
 case the latter is sufficient or if you wish to test in a virtual
-environment you'd need tox. Depending on your preferred setup, you can run the
-tests either as
+environment you'd need tox.
+
+To install pytest, use one of:
+
+  $ dnf install python3-pytest
+
+or
+
+  $ python3 -m pip install --user pytest
+
+To install tox, use one of:
+
+  $ dnf install python3-tox
+
+or
+
+  $ python3 -m pip install --user tox
+
+Additionally, install the remaining test dependencies:
+
+  $ python3 -m pip install -r requirements-test.txt
+
+Depending on your preferred setup, you can run the tests either as
 
   $ python3 -m pytest
 
@@ -47,6 +76,10 @@ or as
 
   $ tox
 
+Free-threaded Python (py313t, py314t) test environments require tox>=4.26
+and the corresponding free-threaded interpreters (python3.13t, python3.14t)
+to be installed.
+
 A makefile shim is also provided for your convenience, so that you don't have
 to care about the exact operations mentioned above and instead you simply do
 

libvirt_python-12.6.0/VERSION

@@ -0,0 +1 @@
+12.6.0

{libvirt_python-12.4.0 → libvirt_python-12.6.0}/build/libvirt_python.egg-info/SOURCES.txt

@@ -55,6 +55,8 @@ tests/test_api_coverage.py
 tests/test_conn.py
 tests/test_domain.py
 tests/test_domain_checkpoint.py
+tests/test_domain_config.py
+tests/test_domain_lifecycle.py
 tests/test_domain_snapshot.py
 tests/test_interface.py
 tests/test_network.py

{libvirt_python-12.4.0 → libvirt_python-12.6.0}/examples/domstart.py

@@ -7,13 +7,12 @@ If the domain is not running, create it.
 import libvirt
 import libxml2
 from argparse import ArgumentParser
-from typing import Tuple
 
 
 # Parse the XML description of domU from FNAME
 # and return a tuple (name, xmldesc) where NAME
 # is the name of the domain, and xmldesc is the contetn of FNAME
-def read_domain(fname: str) -> Tuple[str, str]:
+def read_domain(fname: str) -> tuple[str, str]:
     fp = open(fname, "r")
     xmldesc = fp.read()
     fp.close()

{libvirt_python-12.4.0 → libvirt_python-12.6.0}/examples/esxlist.py

@@ -8,7 +8,7 @@ import libvirt
 import libxml2
 import getpass
 from argparse import ArgumentParser
-from typing import Any, List
+from typing import Any
 
 
 # This is the callback method passed to libvirt.openAuth() (see below).
@@ -25,7 +25,7 @@ from typing import Any, List
 #
 # The user_data argument is the user data item of the auth argument (see below)
 # passed to libvirt.openAuth().
-def request_credentials(credentials: List[List], user_data: Any) -> int:
+def request_credentials(credentials: list[list], user_data: Any) -> int:
     for credential in credentials:
         if credential[0] == libvirt.VIR_CRED_AUTHNAME:
             # prompt the user to input a authname. display the provided message

{libvirt_python-12.4.0 → libvirt_python-12.6.0}/examples/event-test.py

@@ -14,7 +14,7 @@ import errno
 import time
 import threading
 from argparse import ArgumentParser
-from typing import Any, Callable, Dict, List, Optional, TypeVar  # noqa F401
+from typing import Any, Callable, Optional, TypeVar  # noqa F401
 _T = TypeVar("_T")
 _EventCallback = Callable[[int, int, int, _T], None]
 _TimerCallback = Callable[[int, _T], None]
@@ -114,8 +114,8 @@ class virEventLoopPoll:
         self.runningPoll = False
         self.nextHandleID = 1
         self.nextTimerID = 1
-        self.handles = []  # type: List[virEventLoopPollHandle]
-        self.timers = []  # type: List[virEventLoopPollTimer]
+        self.handles = []  # type: list[virEventLoopPollHandle]
+        self.timers = []  # type: list[virEventLoopPollTimer]
         self.cleanup = []
         self.quit = False
 
@@ -603,7 +603,7 @@ def myDomainEventBlockJob2Callback(conn: libvirt.virConnect, dom: libvirt.virDom
         dom.name(), dom.ID(), BLOCK_JOB_TYPES[type], disk, BLOCK_JOB_STATUS[status]))
 
 
-def myDomainEventTunableCallback(conn: libvirt.virConnect, dom: libvirt.virDomain, params: Dict[str, Any], opaque: _T) -> None:
+def myDomainEventTunableCallback(conn: libvirt.virConnect, dom: libvirt.virDomain, params: dict[str, Any], opaque: _T) -> None:
     print("myDomainEventTunableCallback: Domain %s(%s) %s" % (
         dom.name(), dom.ID(), params))
 
@@ -623,7 +623,7 @@ def myDomainEventMigrationIteration(conn: libvirt.virConnect, dom: libvirt.virDo
         dom.name(), dom.ID(), iteration))
 
 
-def myDomainEventJobCompletedCallback(conn: libvirt.virConnect, dom: libvirt.virDomain, params: Dict[str, Any], opaque: _T) -> None:
+def myDomainEventJobCompletedCallback(conn: libvirt.virConnect, dom: libvirt.virDomain, params: dict[str, Any], opaque: _T) -> None:
     print("myDomainEventJobCompletedCallback: Domain %s(%s) %s" % (
         dom.name(), dom.ID(), params))
 

{libvirt_python-12.4.0 → libvirt_python-12.6.0}/examples/nodestats.py

@@ -7,7 +7,7 @@
 import libvirt
 from xml.dom import minidom
 import libxml2
-from typing import Any, Dict  # noqa F401
+from typing import Any  # noqa F401
 
 
 def xpath_eval(ctxt, path: str) -> str:
@@ -52,7 +52,7 @@ domsStrict = [
     if proc.numaParameters()["numa_mode"] == libvirt.VIR_DOMAIN_NUMATUNE_MEM_STRICT
 ]
 
-domsStrictCfg = {}  # type: Dict[libvirt.virDomain, Dict[str, Dict[str, Any]]]
+domsStrictCfg = {}  # type: dict[libvirt.virDomain, dict[str, dict[str, Any]]]
 for dom in domsStrict:
     xmlStr = dom.XMLDesc()
     doc = libxml2.parseDoc(xmlStr)

{libvirt_python-12.4.0 → libvirt_python-12.6.0}/generator.py

@@ -9,16 +9,16 @@ import sys
 import xml.sax
 from contextlib import closing
 from collections import defaultdict
-from typing import Dict, IO, List, Optional, Set, Tuple, Union  # noqa F401
-ArgumentType = Tuple[str, str, str]
-FunctionType = Tuple[str, ArgumentType, List[ArgumentType], str, str, str]
+from typing import IO, Optional, Union  # noqa F401
+ArgumentType = tuple[str, str, str]
+FunctionType = tuple[str, ArgumentType, list[ArgumentType], str, str, str]
 EnumValue = Union[str, int]
-EnumType = Dict[str, EnumValue]
+EnumType = dict[str, EnumValue]
 
-functions = {}  # type: Dict[str, FunctionType]
-enums = defaultdict(dict)  # type: Dict[str, EnumType] # { enumType: { enumConstant: enumValue } }
-event_ids = []  # type: List[str]
-params = []  # type: List[Tuple[str, str]] # [ (paramName, paramValue)... ]
+functions = {}  # type: dict[str, FunctionType]
+enums = defaultdict(dict)  # type: dict[str, EnumType] # { enumType: { enumConstant: enumValue } }
+event_ids = []  # type: list[str]
+params = []  # type: list[tuple[str, str]] # [ (paramName, paramValue)... ]
 
 
 quiet = True
@@ -66,7 +66,7 @@ def parse(data: IO[str]) -> None:
 
 class docParser(xml.sax.handler.ContentHandler):
     def __init__(self) -> None:
-        self._data = []  # type: List[str]
+        self._data = []  # type: list[str]
         self.in_function = False
 
     def characters(self, text: str) -> None:
@@ -74,14 +74,14 @@ class docParser(xml.sax.handler.ContentHandler):
             print("data %s" % text)
         self._data.append(text)
 
-    def startElement(self, tag: str, attrs: Dict[str, str]) -> None:
+    def startElement(self, tag: str, attrs: dict[str, str]) -> None:
         if debug:
             print("start %s, %s" % (tag, attrs))
         if tag == 'function':
             self._data = []
             self.in_function = True
             self.function_cond = ''
-            self.function_args = []  # type: List[ArgumentType]
+            self.function_args = []  # type: list[ArgumentType]
             self.function_descr = ''
             self.function_return = None  # type: Optional[ArgumentType]
             self.function = attrs.get('name', '')
@@ -158,7 +158,7 @@ class docParser(xml.sax.handler.ContentHandler):
                 self.function_cond = str
 
 
-def function(name: str, desc: str, ret: ArgumentType, args: List[ArgumentType], file: str, module: str, cond: str) -> None:
+def function(name: str, desc: str, ret: ArgumentType, args: list[ArgumentType], file: str, module: str, cond: str) -> None:
     if onlyOverrides and name not in functions:
         return
     if name == "virConnectListDomains":
@@ -238,7 +238,7 @@ py_types = {
     '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"),
+    'unsigned char *': ('z', '', "charPtr", "char *", "bytes"),
     'char *': ('z', '', "charPtr", "char *", "str"),
     'const char *': ('z', '', "constcharPtr", "const char *", "str"),
     'size_t': ('n', '', "size_t", "size_t", "int"),
@@ -298,16 +298,16 @@ py_types = {
     '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]]
+}  # 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]",
+    'const unsigned char *': "bytes",
+    'const char **': "list[str]",
+    'unsigned int *': "list[int]",
     'virErrorPtr': "_RawError",
     'virEventAddHandleFunc': "_EventAddHandleFunc[_T]",
     'virEventUpdateHandleFunc': "_EventUpdateHandleFunc",
@@ -319,7 +319,7 @@ py_types_only = {
     'virMemoryParameterPtr': "_MemoryParameter",
     'virSchedParameterPtr': "_SchedParameter",
     'virTypedParameterPtr': "_TypedParameter",
-}  # type: Dict[str, str]
+}  # type: dict[str, str]
 
 
 #######################################################################
@@ -463,6 +463,7 @@ skip_impl = {
     'virDomainRestoreParams',
     'virDomainGetAutostartOnce',
     'virDomainSetThrottleGroup',
+    'virDomainAnnounceInterface',
 
     'virDomainLxcOpenNamespace',
 
@@ -646,8 +647,8 @@ def validate_function(name):
 
 
 def validate_functions():
-    unknown_types = defaultdict(list)  # type: Dict[str, List[str]]
-    funcs_failed = []  # type: List[str]
+    unknown_types = defaultdict(list)  # type: dict[str, list[str]]
+    funcs_failed = []  # type: list[str]
 
     for name in sorted(functions):
         unknown = validate_function(name)
@@ -1036,7 +1037,7 @@ functions_noexcept = {
 
 function_classes = {
     "None": []
-}  # type: Dict[str, List[Tuple[int, str, str, ArgumentType, List[ArgumentType], str, str]]]
+}  # type: dict[str, list[tuple[int, str, str, ArgumentType, list[ArgumentType], str, str]]]
 
 # Functions returning an integral type which need special rules to
 # check for errors and raise exceptions.
@@ -1264,12 +1265,12 @@ def nameFixup(name: str, classe: str, type: str, file: str) -> str:
     return func
 
 
-def functionSortKey(info: Tuple) -> Tuple[str, str]:
+def functionSortKey(info: tuple) -> tuple[str, str]:
     (index, func, name, ret, args, filename, mod) = info
     return func, filename
 
 
-def writeDoc(module: str, name: str, args: List[ArgumentType], indent: str, output: IO) -> None:
+def writeDoc(module: str, name: str, args: list[ArgumentType], indent: str, output: IO) -> None:
     if not functions[name][0]:
         return
     val = functions[name][0]
@@ -1299,10 +1300,10 @@ def emit_py_code(module: str) -> None:
     # Build the list of C types to look for ordered to start
     # with primary classes
     #
-    ctypes = []  # type: List[str]
-    classes_list = []  # type: List[str]
-    ctypes_processed = set()  # type: Set[str]
-    classes_processed = set()  # type: Set[str]
+    ctypes = []  # type: list[str]
+    classes_list = []  # type: list[str]
+    ctypes_processed = set()  # type: set[str]
+    classes_processed = set()  # type: set[str]
     for classe in primary_classes:
         classes_list.append(classe)
         classes_processed.add(classe)
@@ -1390,6 +1391,11 @@ def emit_py_code(module: str) -> None:
     types_map = {name: types[-1] for name, types in py_types.items()}
     types_map.update(py_types_only)
 
+    if module != "libvirt":
+        for name, types in types_map.items():
+            if types.startswith("vir"):
+                types_map[name] = "libvirt." + types
+
     if "None" in function_classes:
         flist = function_classes["None"]
         oldfile = ""
@@ -1403,7 +1409,10 @@ def emit_py_code(module: str) -> None:
                     classes.write(", ")
                 classes.write("%s" % a_name)
                 if a_type in types_map:
-                    classes.write(": \"%s\"" % types_map[a_type])
+                    typ = types_map[a_type]
+                    if a_name == "flags" or is_optional_arg(a_info):
+                        typ = "Optional[%s]" % typ
+                    classes.write(": \"%s\"" % typ)
                 if a_name == "flags" or is_optional_arg(a_info):
                     if is_integral_type(a_type):
                         classes.write("=0")
@@ -1506,18 +1515,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: \"virConnect\", _obj: object=None):\n")
+                classes.write("    def __init__(self, conn: \"virConnect\", _obj: Optional[object]=None):\n")
                 classes.write("        self._conn = conn\n")
             elif classname in ["virDomainCheckpoint", "virDomainSnapshot"]:
-                classes.write("    def __init__(self, dom: \"virDomain\", _obj: object=None):\n")
+                classes.write("    def __init__(self, dom: \"virDomain\", _obj: Optional[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: \"virNetwork\", _obj: object=None) -> None:\n")
+                classes.write("    def __init__(self, net: \"virNetwork\", _obj: Optional[object]=None) -> None:\n")
                 classes.write("        self._net = net\n")
                 classes.write("        self._conn = net.connect()\n")
             else:
-                classes.write("    def __init__(self, _obj: object=None):\n")
+                classes.write("    def __init__(self, _obj: Optional[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")
@@ -1572,7 +1581,10 @@ def emit_py_code(module: str) -> None:
                     if n != index:
                         classes.write(", %s" % a_name)
                         if a_type in types_map:
-                            classes.write(": \"%s\"" % types_map[a_type])
+                            typ = types_map[a_type]
+                            if a_name == "flags" or is_optional_arg(a_info):
+                                typ = "Optional[%s]" % typ
+                            classes.write(": \"%s\"" % typ)
                     if a_name == "flags" or is_optional_arg(a_info):
                         if is_integral_type(a_type):
                             classes.write("=0")
@@ -1682,7 +1694,7 @@ def emit_py_code(module: str) -> None:
                 # that don't exist. This code attempts to detect which
                 # methods to skip by looking at the libvirtmod.XXXX calls
 
-                def shouldSkip(lines: List[str]) -> bool:
+                def shouldSkip(lines: list[str]) -> bool:
                     for line in lines:
                         offset = line.find(pymod + ".")
                         if offset != -1:
@@ -1780,7 +1792,7 @@ def emit_py_code(module: str) -> None:
     #
     # Generate enum constants
     #
-    def enumsSortKey(data: Tuple[str, EnumValue]) -> Tuple[Union[int, float], str]:
+    def enumsSortKey(data: tuple[str, EnumValue]) -> tuple[Union[int, float], str]:
         try:
             value = int(data[1])  # type: Union[int, float]
         except ValueError: