From c654830c5049ffc2b691d724bafc928d10ab5b82 Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Sat, 11 Apr 2020 13:47:37 -0700 Subject: [PATCH] tidying --- assets/src/ba_data/python/ba/_teambasesession.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/assets/src/ba_data/python/ba/_teambasesession.py b/assets/src/ba_data/python/ba/_teambasesession.py index ffd93f36..2bd8bbe6 100644 --- a/assets/src/ba_data/python/ba/_teambasesession.py +++ b/assets/src/ba_data/python/ba/_teambasesession.py @@ -53,7 +53,7 @@ class TeamBaseSession(Session): def __init__(self) -> None: """Set up playlists and launches a ba.Activity to accept joiners.""" # pylint: disable=cyclic-import - from ba import _playlist as bsplaylist + from ba import _playlist from bastd.activity import multiteamjoinscreen app = _ba.app cfg = app.config @@ -67,6 +67,7 @@ class TeamBaseSession(Session): # print('FIXME: TEAM BASE SESSION WOULD CALC DEPS.') depsets: Sequence[ba.DependencySet] = [] + super().__init__(depsets, team_names=team_names, team_colors=team_colors, @@ -105,17 +106,17 @@ class TeamBaseSession(Session): playlist = copy.deepcopy(playlists[self._playlist_name]) else: if self._use_teams: - playlist = bsplaylist.get_default_teams_playlist() + playlist = _playlist.get_default_teams_playlist() else: - playlist = bsplaylist.get_default_free_for_all_playlist() + playlist = _playlist.get_default_free_for_all_playlist() # Resolve types and whatnot to get our final playlist. - playlist_resolved = bsplaylist.filter_playlist(playlist, - sessiontype=type(self), - add_resolved_type=True) + playlist_resolved = _playlist.filter_playlist(playlist, + sessiontype=type(self), + add_resolved_type=True) if not playlist_resolved: - raise Exception("playlist contains no valid games") + raise RuntimeError("Playlist contains no valid games.") self._playlist = ShuffleList(playlist_resolved, shuffle=self._playlist_randomize)