Skip to content

Commit d958754

Browse files
igo95862igo95862
authored
Merge pull request #83 from dragomirecky/small-renaming
Thank you!
2 parents bd88afa + 1fbc7ce commit d958754

9 files changed

+81
-84
lines changed

‎src/sdbus/dbus_common_elements.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@
4949
T = TypeVar('T')
5050

5151

52-
class DbusSomethingCommon:
52+
class DbusMemberCommon:
5353
interface_name: str
5454
serving_enabled: bool
5555

5656

57-
class DbusSomethingAsync(DbusSomethingCommon):
57+
class DbusMemberAsync(DbusMemberCommon):
5858
...
5959

6060

61-
class DbusSomethingSync(DbusSomethingCommon):
61+
class DbusMemberSync(DbusMemberCommon):
6262
...
6363

6464

@@ -83,7 +83,7 @@ def __new__(cls: Type[SelfMeta], name: str,
8383
...
8484

8585
for attr_name, attr in namespace.items():
86-
if not isinstance(attr, DbusSomethingCommon):
86+
if not isinstance(attr, DbusMemberCommon):
8787
continue
8888

8989
# TODO: Fix async metaclass copying all methods
@@ -112,7 +112,7 @@ def __new__(cls: Type[SelfMeta], name: str,
112112
)
113113

114114

115-
class DbusMethodCommon(DbusSomethingCommon):
115+
class DbusMethodCommon(DbusMemberCommon):
116116

117117
def __init__(
118118
self,
@@ -231,7 +231,7 @@ def _rebuild_args(
231231
return new_args_list
232232

233233

234-
class DbusPropertyCommon(DbusSomethingCommon):
234+
class DbusPropertyCommon(DbusMemberCommon):
235235
def __init__(self,
236236
property_name: Optional[str],
237237
property_signature: str,
@@ -262,7 +262,7 @@ def __init__(self,
262262
self.flags = flags
263263

264264

265-
class DbusSignalCommon(DbusSomethingCommon):
265+
class DbusSignalCommon(DbusMemberCommon):
266266
def __init__(self,
267267
signal_name: Optional[str],
268268
signal_signature: str,
@@ -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: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@
3131
DbusClassMeta,
3232
DbusInterfaceMetaCommon,
3333
DbusLocalObjectMeta,
34+
DbusMemberAsync,
35+
DbusMemberCommon,
36+
DbusMemberSync,
3437
DbusMethodOverride,
3538
DbusPropertyOverride,
3639
DbusRemoteObjectMeta,
37-
DbusSomethingAsync,
38-
DbusSomethingCommon,
39-
DbusSomethingSync,
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 DbusLocalMethodAsync, DbusMethodAsync
4343
from .dbus_proxy_async_property import (
44+
DbusLocalPropertyAsync,
4445
DbusPropertyAsync,
45-
DbusPropertyAsyncLocalBind,
4646
)
47-
from .dbus_proxy_async_signal import DbusSignalAsync, DbusSignalAsyncLocalBind
47+
from .dbus_proxy_async_signal import DbusLocalSignalAsync, DbusSignalAsync
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')
@@ -81,7 +81,7 @@ class DbusInterfaceMetaAsync(DbusInterfaceMetaCommon):
8181
def _process_dbus_method_override(
8282
override_attr_name: str,
8383
override: DbusMethodOverride[T],
84-
mro_dbus_elements: Dict[str, DbusSomethingAsync],
84+
mro_dbus_elements: Dict[str, DbusMemberAsync],
8585
) -> DbusMethodAsync:
8686
try:
8787
original_method = mro_dbus_elements[override_attr_name]
@@ -105,7 +105,7 @@ def _process_dbus_method_override(
105105
def _process_dbus_property_override(
106106
override_attr_name: str,
107107
override: DbusPropertyOverride[T],
108-
mro_dbus_elements: Dict[str, DbusSomethingAsync],
108+
mro_dbus_elements: Dict[str, DbusMemberAsync],
109109
) -> DbusPropertyAsync[Any]:
110110
try:
111111
original_property = mro_dbus_elements[override_attr_name]
@@ -137,11 +137,11 @@ def _check_collisions(
137137
cls,
138138
new_class_name: str,
139139
namespace: Dict[str, Any],
140-
mro_dbus_elements: Dict[str, DbusSomethingAsync],
140+
mro_dbus_elements: Dict[str, DbusMemberAsync],
141141
) -> None:
142142

143143
possible_collisions = namespace.keys() & mro_dbus_elements.keys()
144-
new_overrides: Dict[str, DbusSomethingAsync] = {}
144+
new_overrides: Dict[str, DbusMemberAsync] = {}
145145

146146
for attr_name, attr in namespace.items():
147147
if isinstance(attr, DbusMethodOverride):
@@ -173,12 +173,12 @@ def _check_collisions(
173173
def _extract_dbus_elements(
174174
dbus_class: type,
175175
dbus_meta: DbusClassMeta,
176-
) -> Dict[str, DbusSomethingAsync]:
177-
dbus_elements_map: Dict[str, DbusSomethingAsync] = {}
176+
) -> Dict[str, DbusMemberAsync]:
177+
dbus_elements_map: Dict[str, DbusMemberAsync] = {}
178178

179179
for attr_name in dbus_meta.python_attr_to_dbus_member.keys():
180180
dbus_element = dbus_class.__dict__.get(attr_name)
181-
if not isinstance(dbus_element, DbusSomethingAsync):
181+
if not isinstance(dbus_element, DbusMemberAsync):
182182
raise TypeError(
183183
f"Expected async D-Bus element, got {dbus_element!r} "
184184
f"in class {dbus_class!r}"
@@ -193,8 +193,8 @@ def _map_mro_dbus_elements(
193193
cls,
194194
new_class_name: str,
195195
base_classes: Iterable[type],
196-
) -> Dict[str, DbusSomethingAsync]:
197-
all_python_dbus_map: Dict[str, DbusSomethingAsync] = {}
196+
) -> Dict[str, DbusMemberAsync]:
197+
all_python_dbus_map: Dict[str, DbusMemberAsync] = {}
198198
possible_collisions: Set[str] = set()
199199

200200
for c in base_classes:
@@ -227,10 +227,10 @@ def _map_dbus_elements(
227227
meta: DbusClassMeta,
228228
interface_name: str,
229229
) -> None:
230-
if not isinstance(attr, DbusSomethingCommon):
230+
if not isinstance(attr, DbusMemberCommon):
231231
return
232232

233-
if isinstance(attr, DbusSomethingSync):
233+
if isinstance(attr, DbusMemberSync):
234234
raise TypeError(
235235
"Can't mix blocking methods in "
236236
f"async interface: {attr_name!r}"
@@ -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):
350-
assert not isinstance(value, DbusSomethingAsync)
350+
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: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
from weakref import ref as weak_ref
2727

2828
from .dbus_common_elements import (
29-
DbusBindedAsync,
29+
DbusBoundAsync,
30+
DbusMemberAsync,
3031
DbusMethodCommon,
3132
DbusMethodOverride,
3233
DbusRemoteObjectMeta,
33-
DbusSomethingAsync,
3434
)
3535
from .dbus_exceptions import DbusFailedError
3636
from .sd_bus_internals import DbusNoReplyFlag
@@ -52,7 +52,7 @@ def get_current_message() -> SdBusMessage:
5252
return CURRENT_MESSAGE.get()
5353

5454

55-
class DbusMethodAsync(DbusMethodCommon, DbusSomethingAsync):
55+
class DbusMethodAsync(DbusMethodCommon, DbusMemberAsync):
5656

5757
@overload
5858
def __get__(
@@ -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: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
from weakref import ref as weak_ref
2626

2727
from .dbus_common_elements import (
28-
DbusBindedAsync,
28+
DbusBoundAsync,
29+
DbusMemberAsync,
2930
DbusPropertyCommon,
3031
DbusPropertyOverride,
3132
DbusRemoteObjectMeta,
32-
DbusSomethingAsync,
3333
)
3434

3535
if TYPE_CHECKING:
@@ -42,7 +42,7 @@
4242
T = TypeVar('T')
4343

4444

45-
class DbusPropertyAsync(DbusSomethingAsync, DbusPropertyCommon, Generic[T]):
45+
class DbusPropertyAsync(DbusMemberAsync, DbusPropertyCommon, Generic[T]):
4646
def __init__(
4747
self,
4848
property_name: Optional[str],
@@ -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],

0 commit comments

Comments
 (0)