Explicitly derive from SubunitBase

tests/test_mediaplayback_subunit_base.py

@@ -1,5 +1,6 @@
 from ynca import Playback, PlaybackInfo, Repeat, Shuffle
-from ynca.subunits import MediaPlaybackSubunitBase
+from ynca.subunits import MediaPlaybackMixins
+from ynca.subunit import SubunitBase
 
 SYS = "SYS"
 SUBUNIT = "SUBUNIT"
@@ -46,7 +47,7 @@
 ]
 
 
-class DummyMediaPlaybackSubunit(MediaPlaybackSubunitBase):
+class DummyMediaPlaybackSubunit(MediaPlaybackMixins, SubunitBase):
     id = "SUBUNIT"
 
 

ynca/subunits/__init__.py

@@ -51,15 +51,14 @@ class TrackFunctionMixin:
 
 # A number of subunits have the same/similar featureset
 # so make a common base that only needs to be tested once
-class MediaPlaybackSubunitBase(
+class MediaPlaybackMixins(
     PlaybackFunctionMixin,
     PlaybackInfoFunctionMixin,
     RepeatFunctionMixin,
     ShuffleFunctionMixin,
     ArtistFunctionMixin,
     AlbumFunctionMixin,
     SongFunctionMixin,
-    SubunitBase,
 ):
     pass
 

ynca/subunits/ipod.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
+
 from ..constants import Subunit
-from . import MediaPlaybackSubunitBase
+from ..subunit import SubunitBase
+from . import MediaPlaybackMixins
 
 
-class Ipod(MediaPlaybackSubunitBase):
+class Ipod(MediaPlaybackMixins, SubunitBase):
     id = Subunit.IPOD

ynca/subunits/ipodusb.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 from ..constants import Subunit
-from . import MediaPlaybackSubunitBase
+from ..subunit import SubunitBase
+from . import MediaPlaybackMixins
 
 
-class IpodUsb(MediaPlaybackSubunitBase):
+class IpodUsb(MediaPlaybackMixins, SubunitBase):
     id = Subunit.IPODUSB

ynca/subunits/napster.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 from ..constants import Subunit
-from . import MediaPlaybackSubunitBase
+from ..subunit import SubunitBase
+from . import MediaPlaybackMixins
 
 
-class Napster(MediaPlaybackSubunitBase):
+class Napster(MediaPlaybackMixins, SubunitBase):
     id = Subunit.NAPSTER

ynca/subunits/pc.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 from ..constants import Subunit
-from . import MediaPlaybackSubunitBase
+from ..subunit import SubunitBase
+from . import MediaPlaybackMixins
 
 
-class Pc(MediaPlaybackSubunitBase):
+class Pc(MediaPlaybackMixins, SubunitBase):
     id = Subunit.PC

ynca/subunits/rhap.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 from ..constants import Subunit
-from . import MediaPlaybackSubunitBase
+from ..subunit import SubunitBase
+from . import MediaPlaybackMixins
 
 
-class Rhap(MediaPlaybackSubunitBase):
+class Rhap(MediaPlaybackMixins, SubunitBase):
     id = Subunit.RHAP

ynca/subunits/server.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 from ..constants import Subunit
-from . import MediaPlaybackSubunitBase
+from ..subunit import SubunitBase
+from . import MediaPlaybackMixins
 
 
-class Server(MediaPlaybackSubunitBase):
+class Server(MediaPlaybackMixins, SubunitBase):
     id = Subunit.SERVER

ynca/subunits/usb.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 from ..constants import Subunit
-from . import MediaPlaybackSubunitBase
+from ..subunit import SubunitBase
+from . import MediaPlaybackMixins
 
 
-class Usb(MediaPlaybackSubunitBase):
+class Usb(MediaPlaybackMixins, SubunitBase):
     id = Subunit.USB