Skip to content

Commit 647409e

Browse files
dragomireckydragomirecky
committed
Rename *Binded types to *Bound and their subclasses
1 parent 18c98d7 commit 647409e

File tree

7 files changed

+46
-46
lines changed

7 files changed

+46
-46
lines changed

‎src/sdbus/dbus_common_elements.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,11 @@ def __init__(self,
291291
self.__annotations__ = original_method.__annotations__
292292

293293

294-
class DbusBindedAsync:
294+
class DbusBoundAsync:
295295
...
296296

297297

298-
class DbusBindedSync:
298+
class DbusBoundSync:
299299
...
300300

301301

‎src/sdbus/dbus_proxy_async_interface_base.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
DbusMemberSync,
4040
)
4141
from .dbus_common_funcs import get_default_bus
42-
from .dbus_proxy_async_method import DbusMethodAsync, DbusMethodAsyncLocalBind
42+
from .dbus_proxy_async_method import DbusMethodAsync, DbusLocalMethodAsync
4343
from .dbus_proxy_async_property import (
4444
DbusPropertyAsync,
45-
DbusPropertyAsyncLocalBind,
45+
DbusLocalPropertyAsync,
4646
)
47-
from .dbus_proxy_async_signal import DbusSignalAsync, DbusSignalAsyncLocalBind
47+
from .dbus_proxy_async_signal import DbusSignalAsync, DbusLocalSignalAsync
4848
from .sd_bus_internals import SdBusInterface
4949

5050
if TYPE_CHECKING:
@@ -61,7 +61,7 @@
6161
Union,
6262
)
6363

64-
from .dbus_common_elements import DbusBindedAsync
64+
from .dbus_common_elements import DbusBoundAsync
6565
from .sd_bus_internals import SdBus, SdBusSlot
6666

6767
T = TypeVar('T')
@@ -344,20 +344,20 @@ def export_to_dbus(
344344
local_object_meta.attached_bus = bus
345345
local_object_meta.serving_object_path = object_path
346346
# TODO: can be optimized with a single loop
347-
interface_map: Dict[str, List[DbusBindedAsync]] = {}
347+
interface_map: Dict[str, List[DbusBoundAsync]] = {}
348348

349349
for key, value in getmembers(self):
350350
assert not isinstance(value, DbusMemberAsync)
351351

352-
if isinstance(value, DbusMethodAsyncLocalBind):
352+
if isinstance(value, DbusLocalMethodAsync):
353353
interface_name = value.dbus_method.interface_name
354354
if not value.dbus_method.serving_enabled:
355355
continue
356-
elif isinstance(value, DbusPropertyAsyncLocalBind):
356+
elif isinstance(value, DbusLocalPropertyAsync):
357357
interface_name = value.dbus_property.interface_name
358358
if not value.dbus_property.serving_enabled:
359359
continue
360-
elif isinstance(value, DbusSignalAsyncLocalBind):
360+
elif isinstance(value, DbusLocalSignalAsync):
361361
interface_name = value.dbus_signal.interface_name
362362
if not value.dbus_signal.serving_enabled:
363363
continue
@@ -375,7 +375,7 @@ def export_to_dbus(
375375
for interface_name, member_list in interface_map.items():
376376
new_interface = SdBusInterface()
377377
for dbus_something in member_list:
378-
if isinstance(dbus_something, DbusMethodAsyncLocalBind):
378+
if isinstance(dbus_something, DbusLocalMethodAsync):
379379
new_interface.add_method(
380380
dbus_something.dbus_method.method_name,
381381
dbus_something.dbus_method.input_signature,
@@ -385,7 +385,7 @@ def export_to_dbus(
385385
dbus_something.dbus_method.flags,
386386
dbus_something._dbus_reply_call,
387387
)
388-
elif isinstance(dbus_something, DbusPropertyAsyncLocalBind):
388+
elif isinstance(dbus_something, DbusLocalPropertyAsync):
389389
getter = dbus_something._dbus_reply_get
390390
dbus_property = dbus_something.dbus_property
391391

@@ -405,7 +405,7 @@ def export_to_dbus(
405405
setter,
406406
dbus_property.flags,
407407
)
408-
elif isinstance(dbus_something, DbusSignalAsyncLocalBind):
408+
elif isinstance(dbus_something, DbusLocalSignalAsync):
409409
new_interface.add_signal(
410410
dbus_something.dbus_signal.signal_name,
411411
dbus_something.dbus_signal.signal_signature,

‎src/sdbus/dbus_proxy_async_method.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from weakref import ref as weak_ref
2727

2828
from .dbus_common_elements import (
29-
DbusBindedAsync,
29+
DbusBoundAsync,
3030
DbusMethodCommon,
3131
DbusMethodOverride,
3232
DbusRemoteObjectMeta,
@@ -78,20 +78,20 @@ def __get__(
7878
if obj is not None:
7979
dbus_meta = obj._dbus
8080
if isinstance(dbus_meta, DbusRemoteObjectMeta):
81-
return DbusMethodAsyncProxyBind(self, dbus_meta)
81+
return DbusProxyMethodAsync(self, dbus_meta)
8282
else:
83-
return DbusMethodAsyncLocalBind(self, obj)
83+
return DbusLocalMethodAsync(self, obj)
8484
else:
8585
return self
8686

8787

88-
class DbusMethodAsyncBaseBind(DbusBindedAsync):
88+
class DbusBoundMethodAsyncBase(DbusBoundAsync):
8989

9090
def __call__(self, *args: Any, **kwargs: Any) -> Any:
9191
raise NotImplementedError
9292

9393

94-
class DbusMethodAsyncProxyBind(DbusMethodAsyncBaseBind):
94+
class DbusProxyMethodAsync(DbusBoundMethodAsyncBase):
9595
def __init__(
9696
self,
9797
dbus_method: DbusMethodAsync,
@@ -145,7 +145,7 @@ def __call__(self, *args: Any, **kwargs: Any) -> Any:
145145
return self._dbus_async_call(new_call_message)
146146

147147

148-
class DbusMethodAsyncLocalBind(DbusMethodAsyncBaseBind):
148+
class DbusLocalMethodAsync(DbusBoundMethodAsyncBase):
149149
def __init__(
150150
self,
151151
dbus_method: DbusMethodAsync,

‎src/sdbus/dbus_proxy_async_property.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from weakref import ref as weak_ref
2626

2727
from .dbus_common_elements import (
28-
DbusBindedAsync,
28+
DbusBoundAsync,
2929
DbusPropertyCommon,
3030
DbusPropertyOverride,
3131
DbusRemoteObjectMeta,
@@ -84,20 +84,20 @@ def __get__(
8484
self,
8585
obj: DbusInterfaceBaseAsync,
8686
obj_class: Type[DbusInterfaceBaseAsync],
87-
) -> DbusPropertyAsyncBaseBind[T]:
87+
) -> DbusBoundPropertyAsyncBase[T]:
8888
...
8989

9090
def __get__(
9191
self,
9292
obj: Optional[DbusInterfaceBaseAsync],
9393
obj_class: Optional[Type[DbusInterfaceBaseAsync]] = None,
94-
) -> Union[DbusPropertyAsyncBaseBind[T], DbusPropertyAsync[T]]:
94+
) -> Union[DbusBoundPropertyAsyncBase[T], DbusPropertyAsync[T]]:
9595
if obj is not None:
9696
dbus_meta = obj._dbus
9797
if isinstance(dbus_meta, DbusRemoteObjectMeta):
98-
return DbusPropertyAsyncProxyBind(self, dbus_meta)
98+
return DbusProxyPropertyAsync(self, dbus_meta)
9999
else:
100-
return DbusPropertyAsyncLocalBind(self, obj)
100+
return DbusLocalPropertyAsync(self, obj)
101101
else:
102102
return self
103103

@@ -126,7 +126,7 @@ def setter_private(
126126
self.property_setter_is_public = False
127127

128128

129-
class DbusPropertyAsyncBaseBind(DbusBindedAsync, Awaitable[T]):
129+
class DbusBoundPropertyAsyncBase(DbusBoundAsync, Awaitable[T]):
130130
def __await__(self) -> Generator[Any, None, T]:
131131
return self.get_async().__await__()
132132

@@ -137,7 +137,7 @@ async def set_async(self, complete_object: T) -> None:
137137
raise NotImplementedError
138138

139139

140-
class DbusPropertyAsyncProxyBind(DbusPropertyAsyncBaseBind[T]):
140+
class DbusProxyPropertyAsync(DbusBoundPropertyAsyncBase[T]):
141141
def __init__(
142142
self,
143143
dbus_property: DbusPropertyAsync[T],
@@ -179,7 +179,7 @@ async def set_async(self, complete_object: T) -> None:
179179
await bus.call_async(new_set_message)
180180

181181

182-
class DbusPropertyAsyncLocalBind(DbusPropertyAsyncBaseBind[T]):
182+
class DbusLocalPropertyAsync(DbusBoundPropertyAsyncBase[T]):
183183
def __init__(
184184
self,
185185
dbus_property: DbusPropertyAsync[T],

‎src/sdbus/dbus_proxy_async_signal.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from weakref import WeakSet
3535

3636
from .dbus_common_elements import (
37-
DbusBindedAsync,
37+
DbusBoundAsync,
3838
DbusLocalObjectMeta,
3939
DbusRemoteObjectMeta,
4040
DbusSignalCommon,
@@ -85,20 +85,20 @@ def __get__(
8585
self,
8686
obj: DbusInterfaceBaseAsync,
8787
obj_class: Type[DbusInterfaceBaseAsync],
88-
) -> DbusSignalAsyncBaseBind[T]:
88+
) -> DbusBoundSignalAsyncBase[T]:
8989
...
9090

9191
def __get__(
9292
self,
9393
obj: Optional[DbusInterfaceBaseAsync],
9494
obj_class: Optional[Type[DbusInterfaceBaseAsync]] = None,
95-
) -> Union[DbusSignalAsyncBaseBind[T], DbusSignalAsync[T]]:
95+
) -> Union[DbusBoundSignalAsyncBase[T], DbusSignalAsync[T]]:
9696
if obj is not None:
9797
dbus_meta = obj._dbus
9898
if isinstance(dbus_meta, DbusRemoteObjectMeta):
99-
return DbusSignalAsyncProxyBind(self, dbus_meta)
99+
return DbusProxySignalAsync(self, dbus_meta)
100100
else:
101-
return DbusSignalAsyncLocalBind(self, dbus_meta)
101+
return DbusLocalSignalAsync(self, dbus_meta)
102102
else:
103103
return self
104104

@@ -131,7 +131,7 @@ async def catch_anywhere(
131131
)
132132

133133

134-
class DbusSignalAsyncBaseBind(DbusBindedAsync, AsyncIterable[T], Generic[T]):
134+
class DbusBoundSignalAsyncBase(DbusBoundAsync, AsyncIterable[T], Generic[T]):
135135
async def catch(self) -> AsyncIterator[T]:
136136
raise NotImplementedError
137137
yield cast(T, None)
@@ -150,7 +150,7 @@ def emit(self, args: T) -> None:
150150
raise NotImplementedError
151151

152152

153-
class DbusSignalAsyncProxyBind(DbusSignalAsyncBaseBind[T]):
153+
class DbusProxySignalAsync(DbusBoundSignalAsyncBase[T]):
154154
def __init__(
155155
self,
156156
dbus_signal: DbusSignalAsync[T],
@@ -224,7 +224,7 @@ def emit(self, args: T) -> None:
224224
raise RuntimeError("Cannot emit signal from D-Bus proxy.")
225225

226226

227-
class DbusSignalAsyncLocalBind(DbusSignalAsyncBaseBind[T]):
227+
class DbusLocalSignalAsync(DbusBoundSignalAsyncBase[T]):
228228
def __init__(
229229
self,
230230
dbus_signal: DbusSignalAsync[T],

‎src/sdbus/dbus_proxy_sync_method.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from typing import TYPE_CHECKING, TypeVar, cast
2525

2626
from .dbus_common_elements import (
27-
DbusBindedSync,
27+
DbusBoundSync,
2828
DbusMethodCommon,
2929
DbusMemberSync,
3030
)
@@ -42,10 +42,10 @@ def __get__(self,
4242
obj: DbusInterfaceBase,
4343
obj_class: Optional[Type[DbusInterfaceBase]] = None,
4444
) -> Callable[..., Any]:
45-
return DbusMethodSyncBinded(self, obj)
45+
return DbusLocalMethodSync(self, obj)
4646

4747

48-
class DbusMethodSyncBinded(DbusBindedSync):
48+
class DbusLocalMethodSync(DbusBoundSync):
4949
def __init__(self,
5050
dbus_method: DbusMethodSync,
5151
interface: DbusInterfaceBase):

‎src/sdbus/unittest.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434

3535
from .dbus_common_funcs import set_default_bus
3636
from .dbus_proxy_async_signal import (
37-
DbusSignalAsyncLocalBind,
38-
DbusSignalAsyncProxyBind,
37+
DbusLocalSignalAsync,
38+
DbusProxySignalAsync,
3939
)
4040
from .sd_bus_internals import SdBusMessage, sd_bus_open_user
4141

@@ -52,7 +52,7 @@
5252

5353
from .dbus_proxy_async_signal import (
5454
DbusSignalAsync,
55-
DbusSignalAsyncBaseBind,
55+
DbusBoundSignalAsyncBase,
5656
)
5757
from .sd_bus_internals import SdBus, SdBusSlot
5858

@@ -124,7 +124,7 @@ def __init__(
124124
self,
125125
timeout: Union[int, float],
126126
bus: SdBus,
127-
remote_signal: DbusSignalAsyncProxyBind[Any],
127+
remote_signal: DbusProxySignalAsync[Any],
128128
):
129129
super().__init__(timeout)
130130
self._bus = bus
@@ -156,7 +156,7 @@ class DbusSignalRecorderLocal(DbusSignalRecorderBase):
156156
def __init__(
157157
self,
158158
timeout: Union[int, float],
159-
local_signal: DbusSignalAsyncLocalBind[Any],
159+
local_signal: DbusLocalSignalAsync[Any],
160160
):
161161
super().__init__(timeout)
162162
self._local_signal_ref: weak_ref[DbusSignalAsync[Any]] = (
@@ -240,13 +240,13 @@ async def asyncSetUp(self) -> None:
240240

241241
def assertDbusSignalEmits(
242242
self,
243-
signal: DbusSignalAsyncBaseBind[Any],
243+
signal: DbusBoundSignalAsyncBase[Any],
244244
timeout: Union[int, float] = 1,
245245
) -> AsyncContextManager[DbusSignalRecorderBase]:
246246

247-
if isinstance(signal, DbusSignalAsyncLocalBind):
247+
if isinstance(signal, DbusLocalSignalAsync):
248248
return DbusSignalRecorderLocal(timeout, signal)
249-
elif isinstance(signal, DbusSignalAsyncProxyBind):
249+
elif isinstance(signal, DbusProxySignalAsync):
250250
return DbusSignalRecorderRemote(timeout, self.bus, signal)
251251
else:
252252
raise TypeError("Unknown or unsupported signal class.")

0 commit comments

Comments
 (0)