Rename timeout to default_timeout

We want to add the flexibility to override with a different timeout for
individual methods.

Signed-off-by: mulhern <amulhern@redhat.com>

Author: mulkieran

src/dbus_python_client_gen/_invokers.py

@@ -28,7 +28,7 @@
 
 
 def prop_builder(
-    interface_name: str, properties: Sequence[ET.Element], timeout: int
+    interface_name: str, properties: Sequence[ET.Element], default_timeout: int
 ) -> Callable[[MutableMapping[str, Type]], None]:
     """
     Returns a function that builds a property interface based on arguments.
@@ -51,7 +51,7 @@ def prop_builder(
     :param str interface_name: the interface to which these properties belong
     :param properties: iterable of interface specifications for each property
     :type properties: iterable of xml.element.ElementTree.Element
-    :param int timeout: the dbus method timeout, -1 is the libdbus default ~25s.
+    :param int defaul_timeout: the dbus timeout, -1 is the libdbus default ~25s
 
     :raises DPClientGenerationError:
     """
@@ -74,7 +74,7 @@ def dbus_func(proxy_object: ProxyObject) -> Any:
                     interface_name,
                     name,
                     dbus_interface=dbus.PROPERTIES_IFACE,
-                    timeout=timeout,
+                    timeout=default_timeout,
                 )
             except dbus.DBusException as err:  # pragma: no cover
                 err_msg = (
@@ -132,7 +132,7 @@ def dbus_func(proxy_object: ProxyObject, value: Any) -> None:
                     name,
                     arg,
                     dbus_interface=dbus.PROPERTIES_IFACE,
-                    timeout=timeout,
+                    timeout=default_timeout,
                 )
             except dbus.DBusException as err:  # pragma: no cover
                 err_msg = (
@@ -243,7 +243,7 @@ class has up to two static methods, a Get method if the property is
 
 
 def method_builder(
-    interface_name: str, methods: Sequence[ET.Element], timeout: int
+    interface_name: str, methods: Sequence[ET.Element], default_timeout: int
 ) -> Callable[[MutableMapping[str, Callable]], None]:
     """
     Returns a function that builds a method interface based on 'spec'.
@@ -262,7 +262,7 @@ def method_builder(
     :param str interface_name: name the interface to which the methods belong
     :param methods: the iterable of interface specification for each method
     :type methods: iterator of xml.element.ElementTree.Element
-    :param int timeout: the dbus method timeout, -1 is the libdbus default ~25s.
+    :param int default_timeout: D-Bus timeout, -1 is the libdbus default ~25s.
 
     :raises DPClientGenerationError:
     """
@@ -355,7 +355,9 @@ def dbus_func(proxy_object: ProxyObject, func_args: Mapping[str, Any]) -> Any:
             )  # pragma: no cover
 
             try:  # pragma: no cover
-                return dbus_method(*xformed_args, signature=signature, timeout=timeout)
+                return dbus_method(
+                    *xformed_args, signature=signature, timeout=default_timeout
+                )
             except dbus.DBusException as err:  # pragma: no cover
                 arg_str = ", ".join(repr(arg) for arg in xformed_args)
                 err_msg = (
@@ -409,15 +411,15 @@ def builder(namespace: MutableMapping[str, Callable]) -> None:
     return builder
 
 
-def make_class(name: str, spec: ET.Element, timeout: int = -1) -> Type:
+def make_class(name: str, spec: ET.Element, default_timeout: int = -1) -> Type:
     """
     Make a class, name, from the given spec.
     The class defines static properties and methods according to the spec.
 
     :param str name: the name of the class.
     :param spec: the interface specification
     :type spec: xml.element.ElementTree.Element
-    :param int timeout: dbus timeout for method(s), -1 is libdbus default ~25s.
+    :param int default_timeout: D-Bus timeout, -1 is libdbus default ~25s
     :returns: the constructed class
     :rtype: type
     """
@@ -428,9 +430,11 @@ def make_class(name: str, spec: ET.Element, timeout: int = -1) -> Type:
         raise DPClientGenerationError("No name attribute found for interface") from err
 
     method_builder_arg = method_builder(
-        interface_name, spec.findall("./method"), timeout
+        interface_name, spec.findall("./method"), default_timeout
+    )
+    prop_builder_arg = prop_builder(
+        interface_name, spec.findall("./property"), default_timeout
     )
-    prop_builder_arg = prop_builder(interface_name, spec.findall("./property"), timeout)
 
     def builder(namespace: MutableMapping[str, Type]) -> None:
         """