Exceptions typing in bastd ui

assets/src/ba_data/python/bastd/ui/account/settings.py

@@ -627,7 +627,7 @@ class AccountSettingsWindow(ba.Window):
             elif account_type == 'Game Circle':
                 account_type_name = ba.Lstr(resource='gameCircleText')
             else:
-                raise Exception("unknown account type: '" + str(account_type) +
+                raise ValueError("unknown account type: '" + str(account_type) +
                                  "'")
             self._game_service_button = btn = ba.buttonwidget(
                 parent=self._subcontainer,
@@ -1105,7 +1105,7 @@ class AccountSettingsWindow(ba.Window):
             elif sel == self._scrollwidget:
                 sel_name = 'Scroll'
             else:
-                raise Exception('unrecognized selection')
+                raise ValueError('unrecognized selection')
             ba.app.window_states[self.__class__.__name__] = sel_name
         except Exception:
             ba.print_exception('exception saving state for', self.__class__)

assets/src/ba_data/python/bastd/ui/colorpicker.py

@@ -50,7 +50,7 @@ class ColorPicker(popup.PopupWindow):
 
         c_raw = get_player_colors()
         if len(c_raw) != 16:
-            raise Exception('expected 16 player colors')
+            raise ValueError('expected 16 player colors')
         self.colors = [c_raw[0:4], c_raw[4:8], c_raw[8:12], c_raw[12:16]]
 
         if scale is None:
@@ -189,7 +189,7 @@ class ColorPickerExact(popup.PopupWindow):
         from ba.internal import get_player_colors
         c_raw = get_player_colors()
         if len(c_raw) != 16:
-            raise Exception('expected 16 player colors')
+            raise ValueError('expected 16 player colors')
         self.colors = [c_raw[0:4], c_raw[4:8], c_raw[8:12], c_raw[12:16]]
 
         if scale is None:

assets/src/ba_data/python/bastd/ui/coop/browser.py

@@ -1555,7 +1555,7 @@ class CoopBrowserWindow(ba.Window):
             elif sel == self._scrollwidget:
                 sel_name = 'Scroll'
             else:
-                raise Exception('unrecognized selection')
+                raise ValueError('unrecognized selection')
             ba.app.window_states[self.__class__.__name__] = {
                 'sel_name': sel_name
             }

assets/src/ba_data/python/bastd/ui/gather.py

@@ -807,11 +807,8 @@ class GatherWindow(ba.Window):
                         color=(1, 0, 0))
                     ba.playsound(ba.getsound('error'))
                     return
-                try:
                 port = int(cast(str, ba.textwidget(query=port_textwidget)))
                 if port > 65535 or port < 0:
-                        raise Exception()
-                except Exception:
                     ba.screenmessage(
                         ba.Lstr(resource='internal.invalidPortErrorText'),
                         color=(1, 0, 0))
@@ -1958,7 +1955,7 @@ class GatherWindow(ba.Window):
             elif sel == self._tab_container:
                 sel_name = 'TabContainer'
             else:
-                raise Exception('unrecognized selection: ' + str(sel))
+                raise ValueError(f'unrecognized selection: \'{sel}\'')
             ba.app.window_states[self.__class__.__name__] = {
                 'sel_name': sel_name,
                 'tab': self._current_tab,

assets/src/ba_data/python/bastd/ui/mainmenu.py

@@ -321,7 +321,6 @@ class MainMenuWindow(ba.Window):
             # we want back presses to quit our activity.
             if (not self._in_game and not self._have_quit_button
                 and ba.app.platform == 'android'):
-
                 def _do_quit() -> None:
                     confirm.QuitWindow(swish=True, back=True)
 
@@ -673,7 +672,7 @@ class MainMenuWindow(ba.Window):
                     if (not isinstance(cme, dict) or 'label' not in cme
                         or not isinstance(cme['label'], (str, ba.Lstr))
                         or 'call' not in cme or not callable(cme['call'])):
-                        raise Exception('invalid custom menu entry: ' +
+                        raise ValueError('invalid custom menu entry: ' +
                                          str(cme))
             except Exception:
                 custom_menu_entries = []

assets/src/ba_data/python/bastd/ui/play.py

@@ -538,7 +538,7 @@ class PlayWindow(ba.Window):
             elif sel == self._back_button:
                 sel_name = 'Back'
             else:
-                raise Exception('unrecognized selected widget')
+                raise ValueError(f'unrecognized selection {sel}')
             ba.app.window_states[self.__class__.__name__] = sel_name
         except Exception:
             ba.print_exception('error saving state for', self.__class__)

assets/src/ba_data/python/bastd/ui/playlist/__init__.py

@@ -58,7 +58,7 @@ class PlaylistTypeVars:
                 fallback_resource='freeForAllText')
             self.sessiontype = ba.FreeForAllSession
         else:
-            raise Exception('playlist type vars undefined for session type: ' +
+            raise TypeError('playlist type vars undefined for session type: ' +
                             str(sessiontype))
         self.default_list_name = ba.Lstr(resource='defaultGameListNameText',
                                          subs=[('${PLAYMODE}', play_mode_name)

assets/src/ba_data/python/bastd/ui/playlist/browser.py

@@ -62,7 +62,7 @@ class PlaylistBrowserWindow(ba.Window):
             ba.app.main_window = 'Free-for-All Game Select'
             ba.set_analytics_screen('FreeForAll Window')
         else:
-            raise Exception(f'invalid sessiontype: {sessiontype}')
+            raise TypeError(f'invalid sessiontype: {sessiontype}')
         self._pvars = playlist.PlaylistTypeVars(sessiontype)
 
         self._sessiontype = sessiontype

assets/src/ba_data/python/bastd/ui/playlist/editgame.py

@@ -264,19 +264,19 @@ class PlaylistEditGameWindow(ba.Window):
             if 'choices' in setting:
                 for choice in setting['choices']:
                     if len(choice) != 2:
-                        raise Exception(
+                        raise ValueError(
                             "Expected 2-member tuples for 'choices'; got: " +
                             repr(choice))
                     if not isinstance(choice[0], str):
-                        raise Exception(
+                        raise TypeError(
                             'First value for choice tuple must be a str; got: '
                             + repr(choice))
                     if not isinstance(choice[1], value_type):
-                        raise Exception(
+                        raise TypeError(
                             'Choice type does not match default value; choice:'
                             + repr(choice) + '; setting:' + repr(setting))
                 if value_type not in (int, float):
-                    raise Exception(
+                    raise TypeError(
                         'Choice type setting must have int or float default; '
                         'got: ' + repr(setting))
 
@@ -509,5 +509,5 @@ class PlaylistEditGameWindow(ba.Window):
         elif setting_type == int:
             ba.textwidget(edit=ctrl, text=str(int(val)))
         else:
-            raise Exception('invalid vartype: ' + str(setting_type))
+            raise TypeError('invalid vartype: ' + str(setting_type))
         self._settings[setting_name] = val

assets/src/ba_data/python/bastd/ui/playoptions.py

@@ -93,7 +93,7 @@ class PlayOptionsWindow(popup.PopupWindow):
                 elif self._sessiontype is ba.DualTeamSession:
                     plst = get_default_teams_playlist()
                 else:
-                    raise Exception('unrecognized session-type: ' +
+                    raise TypeError('unrecognized session-type: ' +
                                     str(self._sessiontype))
             else:
                 try:

assets/src/ba_data/python/bastd/ui/popup.py

@@ -153,7 +153,7 @@ class PopupMenuWindow(PopupWindow):
         self._choices_disabled = list(choices_disabled)
         self._done_building = False
         if not choices:
-            raise Exception('Must pass at least one choice')
+            raise TypeError('Must pass at least one choice')
         self._width = width
         self._scale = scale
         if len(choices) > 8:
@@ -302,7 +302,7 @@ class PopupMenu:
             current_choice = None
         self._choices = list(choices)
         if not choices:
-            raise Exception('no choices given')
+            raise TypeError('no choices given')
         self._choices_display = list(choices_display)
         self._choices_disabled = list(choices_disabled)
         self._width = width
@@ -313,7 +313,7 @@ class PopupMenu:
         self._position = position
         self._parent = parent
         if not choices:
-            raise Exception('Must pass at least one choice')
+            raise TypeError('Must pass at least one choice')
         self._parent = parent
         self._button_size = button_size
 

assets/src/ba_data/python/bastd/ui/profile/edit.py

@@ -546,7 +546,7 @@ class EditProfileWindow(ba.Window):
         elif picker_type == 'highlight':
             initial_color = self._highlight
         else:
-            raise Exception('invalid picker_type: ' + picker_type)
+            raise ValueError('invalid picker_type: ' + picker_type)
         colorpicker.ColorPicker(
             parent=self._root_widget,
             position=origin,

assets/src/ba_data/python/bastd/ui/purchase.py

@@ -44,7 +44,7 @@ class PurchaseWindow(ba.Window):
             header_text = ba.Lstr(resource='unlockThisText',
                                   fallback_resource='unlockThisInTheStoreText')
         if len(items) != 1:
-            raise Exception('expected exactly 1 item')
+            raise ValueError('expected exactly 1 item')
         self._items = list(items)
         self._width = 580
         self._height = 520

assets/src/ba_data/python/bastd/ui/settings/advanced.py

@@ -596,11 +596,11 @@ class AdvancedSettingsWindow(ba.Window):
                 elif sel == self._language_inform_checkbox:
                     sel_name = 'LangInform'
                 else:
-                    raise Exception('unrecognized selection')
+                    raise ValueError(f'unrecognized selection \'{sel}\'')
             elif sel == self._back_button:
                 sel_name = 'Back'
             else:
-                raise Exception('unrecognized selection')
+                raise ValueError(f'unrecognized selection \'{sel}\'')
             ba.app.window_states[self.__class__.__name__] = {
                 'sel_name': sel_name
             }

assets/src/ba_data/python/bastd/ui/settings/allsettings.py

@@ -252,7 +252,7 @@ class AllSettingsWindow(ba.Window):
             elif sel == self._back_button:
                 sel_name = 'Back'
             else:
-                raise Exception('unrecognized selection')
+                raise ValueError(f'unrecognized selection \'{sel}\'')
             ba.app.window_states[self.__class__.__name__] = {
                 'sel_name': sel_name
             }

assets/src/ba_data/python/bastd/ui/settings/audio.py

@@ -266,7 +266,7 @@ class AudioSettingsWindow(ba.Window):
             elif sel == self._vr_head_relative_audio_button:
                 sel_name = 'VRHeadRelative'
             else:
-                raise Exception('unrecognized selected widget')
+                raise ValueError(f'unrecognized selection \'{sel}\'')
             ba.app.window_states[self.__class__.__name__] = sel_name
         except Exception:
             ba.print_exception('error saving state for', self.__class__)

assets/src/ba_data/python/bastd/ui/settings/testing.py

@@ -167,7 +167,7 @@ class TestingWindow(ba.Window):
         for entry in self._entries:
             if entry['name'] == name:
                 return entry
-        raise Exception(f'Entry not found: {name}')
+        raise ba.NotFoundError(f'Entry not found: {name}')
 
     def _on_reset_press(self) -> None:
         for entry in self._entries:

assets/src/ba_data/python/bastd/ui/soundtrack/browser.py

@@ -485,7 +485,7 @@ class SoundtrackBrowserWindow(ba.Window):
             elif sel == self._back_button:
                 sel_name = 'Back'
             else:
-                raise Exception('unrecognized selection')
+                raise ValueError(f'unrecognized selection \'{sel}\'')
             ba.app.window_states[self.__class__.__name__] = sel_name
         except Exception:
             ba.print_exception('error saving state for', self.__class__)

assets/src/ba_data/python/bastd/ui/store/browser.py

@@ -1002,7 +1002,7 @@ class StoreBrowserWindow(ba.Window):
                 sel_name = 'Tab:' + list(self._tab_buttons.keys())[list(
                     self._tab_buttons.values()).index(sel)]
             else:
-                raise Exception('unrecognized selection')
+                raise ValueError(f'unrecognized selection \'{sel}\'')
             ba.app.window_states[self.__class__.__name__] = {
                 'sel_name': sel_name,
                 'tab': self._current_tab

assets/src/ba_data/python/bastd/ui/tournamententry.py

@@ -69,7 +69,7 @@ class TournamentEntryWindow(popup.PopupWindow):
             self._purchase_price_name = 'price.tournament_entry_1'
         else:
             if self._fee != 0:
-                raise Exception('invalid fee: ' + str(self._fee))
+                raise ValueError('invalid fee: ' + str(self._fee))
             self._purchase_name = 'tournament_entry_0'
             self._purchase_price_name = 'price.tournament_entry_0'
 

assets/src/ba_data/python/bastd/ui/watch.py

@@ -482,7 +482,7 @@ class WatchWindow(ba.Window):
             elif sel == self._tab_container:
                 sel_name = 'TabContainer'
             else:
-                raise Exception('unrecognized selection')
+                raise ValueError(f'unrecognized selection {sel}')
             ba.app.window_states[self.__class__.__name__] = {
                 'sel_name': sel_name,
                 'tab': self._current_tab