Skip to content

Commit 229588b

Browse files
committed
Rename Merge to Merger
In this case it is better to introduce a breaking change to make sure users update to using the new `merge()` function. Also using a noun for the name is more in line with the other classes. Signed-off-by: Leandro Lucarella <[email protected]>
1 parent 14db23a commit 229588b

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/frequenz/channels/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
from ._anycast import Anycast
7878
from ._broadcast import Broadcast
7979
from ._exceptions import ChannelClosedError, ChannelError, Error
80-
from ._merge import Merge, merge
80+
from ._merge import Merger, merge
8181
from ._receiver import Receiver, ReceiverError, ReceiverStoppedError
8282
from ._select import (
8383
Selected,
@@ -95,7 +95,7 @@
9595
"ChannelClosedError",
9696
"ChannelError",
9797
"Error",
98-
"Merge",
98+
"Merger",
9999
"Receiver",
100100
"ReceiverError",
101101
"ReceiverStoppedError",

src/frequenz/channels/_merge.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
_T = TypeVar("_T")
1616

1717

18-
def merge(*receivers: Receiver[_T]) -> Merge[_T]:
18+
def merge(*receivers: Receiver[_T]) -> Merger[_T]:
1919
"""Merge messages coming from multiple receivers into a single stream.
2020
2121
Example:
@@ -48,19 +48,19 @@ def merge(*receivers: Receiver[_T]) -> Merge[_T]:
4848
if not receivers:
4949
raise ValueError("At least one receiver must be provided")
5050

51-
return Merge(*receivers, name="merge")
51+
return Merger(*receivers, name="merge")
5252

5353

54-
class Merge(Receiver[_T]):
54+
class Merger(Receiver[_T]):
5555
"""A receiver that merges messages coming from multiple receivers into a single stream.
5656
5757
Tip:
5858
Please consider using the more idiomatic [`merge()`][freq.channels.merge]
59-
function instead of creating a `Merge` instance directly.
59+
function instead of creating a `Merger` instance directly.
6060
"""
6161

6262
def __init__(self, *receivers: Receiver[_T], name: str | None) -> None:
63-
"""Create a `Merge` instance.
63+
"""Create a `Merger` instance.
6464
6565
Args:
6666
*receivers: The receivers to merge.
@@ -84,7 +84,7 @@ def __del__(self) -> None:
8484
task.cancel()
8585

8686
async def stop(self) -> None:
87-
"""Stop the `Merge` instance and cleanup any pending tasks."""
87+
"""Stop the `Merger` instance and cleanup any pending tasks."""
8888
for task in self._pending:
8989
task.cancel()
9090
await asyncio.gather(*self._pending, return_exceptions=True)

0 commit comments

Comments
 (0)