RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-05 15:03:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixing some quotes I accidentally made ugly while fiddling with black settings

Browse Source
This commit is contained in:
Eric 2023-07-31 19:20:02 -07:00
parent 0a70c236af
commit c83b16b9a8
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/assets/ba_data/python/bascenev1/_activity.py
View File

@ -18,8 +18,8 @@ if TYPE_CHECKING:
from typing import Any from typing import Any
import bascenev1 import bascenev1
PlayerT = TypeVar("PlayerT", bound=Player) PlayerT = TypeVar('PlayerT', bound=Player)
TeamT = TypeVar("TeamT", bound=Team) TeamT = TypeVar('TeamT', bound=Team)
class Activity(DependencyComponent, Generic[PlayerT, TeamT]): class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
@ -300,7 +300,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
self._expire() self._expire()
else: else:
raise RuntimeError( raise RuntimeError(
f"destroy() called when" f" already expired for {self}" f'destroy() called when already expired for {self}.'
) )
def retain_actor(self, actor: bascenev1.Actor) -> None: def retain_actor(self, actor: bascenev1.Actor) -> None:
@ -410,7 +410,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
# Set up the globals node based on our settings. # Set up the globals node based on our settings.
with self.context: with self.context:
glb = self._globalsnode = _bascenev1.newnode("globals") glb = self._globalsnode = _bascenev1.newnode('globals')
# Now that it's going to be front and center, # Now that it's going to be front and center,
# set some global values based on what the activity wants. # set some global values based on what the activity wants.
@ -452,7 +452,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
try: try:
self.on_transition_in() self.on_transition_in()
except Exception: except Exception:
logging.exception("Error in on_transition_in for %s.", self) logging.exception('Error in on_transition_in for %s.', self)
# Tell the C++ layer that this activity is the main one, so it uses # Tell the C++ layer that this activity is the main one, so it uses
# settings from our globals, directs various events to us, etc. # settings from our globals, directs various events to us, etc.
@ -466,7 +466,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
try: try:
self.on_transition_out() self.on_transition_out()
except Exception: except Exception:
logging.exception("Error in on_transition_out for %s.", self) logging.exception('Error in on_transition_out for %s.', self)
def begin(self, session: bascenev1.Session) -> None: def begin(self, session: bascenev1.Session) -> None:
"""Begin the activity. """Begin the activity.
@ -562,7 +562,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
try: try:
self.on_player_join(player) self.on_player_join(player)
except Exception: except Exception:
logging.exception("Error in on_player_join for %s.", self) logging.exception('Error in on_player_join for %s.', self)
def remove_player(self, sessionplayer: bascenev1.SessionPlayer) -> None: def remove_player(self, sessionplayer: bascenev1.SessionPlayer) -> None:
"""Remove a player from the Activity while it is running. """Remove a player from the Activity while it is running.
@ -592,11 +592,11 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
try: try:
self.on_player_leave(player) self.on_player_leave(player)
except Exception: except Exception:
logging.exception("Error in on_player_leave for %s.", self) logging.exception('Error in on_player_leave for %s.', self)
try: try:
player.leave() player.leave()
except Exception: except Exception:
logging.exception("Error on leave for %s in %s.", player, self) logging.exception('Error on leave for %s in %s.', player, self)
self._reset_session_player_for_no_activity(sessionplayer) self._reset_session_player_for_no_activity(sessionplayer)
@ -621,7 +621,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
try: try:
self.on_team_join(team) self.on_team_join(team)
except Exception: except Exception:
logging.exception("Error in on_team_join for %s.", self) logging.exception('Error in on_team_join for %s.', self)
def remove_team(self, sessionteam: bascenev1.SessionTeam) -> None: def remove_team(self, sessionteam: bascenev1.SessionTeam) -> None:
"""Remove a team from a Running Activity """Remove a team from a Running Activity
@ -643,11 +643,11 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
try: try:
self.on_team_leave(team) self.on_team_leave(team)
except Exception: except Exception:
logging.exception("Error in on_team_leave for %s.", self) logging.exception('Error in on_team_leave for %s.', self)
try: try:
team.leave() team.leave()
except Exception: except Exception:
logging.exception("Error on leave for %s in %s.", team, self) logging.exception('Error on leave for %s in %s.', team, self)
sessionteam.activityteam = None sessionteam.activityteam = None
@ -668,7 +668,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
sessionplayer.setnode(None) sessionplayer.setnode(None)
except Exception: except Exception:
logging.exception( logging.exception(
"Error resetting SessionPlayer node on %s for %s.", 'Error resetting SessionPlayer node on %s for %s.',
sessionplayer, sessionplayer,
self, self,
) )
@ -676,7 +676,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
sessionplayer.resetinput() sessionplayer.resetinput()
except Exception: except Exception:
logging.exception( logging.exception(
"Error resetting SessionPlayer input on %s for %s.", 'Error resetting SessionPlayer input on %s for %s.',
sessionplayer, sessionplayer,
self, self,
) )
@ -701,17 +701,17 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
if not isinstance(self._playertype, type): if not isinstance(self._playertype, type):
self._playertype = Player self._playertype = Player
print( print(
f"ERROR: {type(self)} was not passed a Player" f'ERROR: {type(self)} was not passed a Player'
f" type argument; please explicitly pass bascenev1.Player" f' type argument; please explicitly pass bascenev1.Player'
f" if you do not want to override it." f' if you do not want to override it.'
) )
self._teamtype = type(self).__orig_bases__[-1].__args__[1] self._teamtype = type(self).__orig_bases__[-1].__args__[1]
if not isinstance(self._teamtype, type): if not isinstance(self._teamtype, type):
self._teamtype = Team self._teamtype = Team
print( print(
f"ERROR: {type(self)} was not passed a Team" f'ERROR: {type(self)} was not passed a Team'
f" type argument; please explicitly pass bascenev1.Team" f' type argument; please explicitly pass bascenev1.Team'
f" if you do not want to override it." f' if you do not want to override it.'
) )
assert issubclass(self._playertype, Player) assert issubclass(self._playertype, Player)
assert issubclass(self._teamtype, Team) assert issubclass(self._teamtype, Team)
@ -729,24 +729,24 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
try: try:
activity = activity_ref() activity = activity_ref()
print( print(
"ERROR: Activity is not dying when expected:", 'ERROR: Activity is not dying when expected:',
activity, activity,
"(warning " + str(counter[0] + 1) + ")", '(warning ' + str(counter[0] + 1) + ')',
) )
print( print(
"This means something is still strong-referencing it.\n" 'This means something is still strong-referencing it.\n'
"Check out methods such as efro.debug.printrefs() to" 'Check out methods such as efro.debug.printrefs() to'
" help debug this sort of thing." ' help debug this sort of thing.'
) )
# Note: no longer calling gc.get_referrers() here because it's # Note: no longer calling gc.get_referrers() here because it's
# usage can bork stuff. (see notes at top of efro.debug) # usage can bork stuff. (see notes at top of efro.debug)
counter[0] += 1 counter[0] += 1
if counter[0] == 4: if counter[0] == 4:
print("Killing app due to stuck activity... :-(") print('Killing app due to stuck activity... :-(')
babase.quit() babase.quit()
except Exception: except Exception:
logging.exception("Error on _check_activity_death.") logging.exception('Error on _check_activity_death.')
def _expire(self) -> None: def _expire(self) -> None:
"""Put the activity in a state where it can be garbage-collected. """Put the activity in a state where it can be garbage-collected.
@ -760,12 +760,12 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
try: try:
self.on_expire() self.on_expire()
except Exception: except Exception:
logging.exception("Error in Activity on_expire() for %s.", self) logging.exception('Error in Activity on_expire() for %s.', self)
try: try:
self._customdata = None self._customdata = None
except Exception: except Exception:
logging.exception("Error clearing customdata for %s.", self) logging.exception('Error clearing customdata for %s.', self)
# Don't want to be holding any delay-delete refs at this point. # Don't want to be holding any delay-delete refs at this point.
self._prune_delay_deletes() self._prune_delay_deletes()
@ -780,7 +780,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
try: try:
self._activity_data.expire() self._activity_data.expire()
except Exception: except Exception:
logging.exception("Error expiring _activity_data for %s.", self) logging.exception('Error expiring _activity_data for %s.', self)
def _expire_actors(self) -> None: def _expire_actors(self) -> None:
# Expire all Actors. # Expire all Actors.
@ -792,7 +792,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
actor.on_expire() actor.on_expire()
except Exception: except Exception:
logging.exception( logging.exception(
"Error in Actor.on_expire() for %s.", actor_ref() 'Error in Actor.on_expire() for %s.', actor_ref()
) )
def _expire_players(self) -> None: def _expire_players(self) -> None:
@ -810,7 +810,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
try: try:
player.expire() player.expire()
except Exception: except Exception:
logging.exception("Error expiring %s.", player) logging.exception('Error expiring %s.', player)
# Reset the SessionPlayer to a not-in-an-activity state. # Reset the SessionPlayer to a not-in-an-activity state.
try: try:
@ -821,7 +821,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
# until now whos underlying SessionPlayer left long ago... # until now whos underlying SessionPlayer left long ago...
pass pass
except Exception: except Exception:
logging.exception("Error expiring %s.", player) logging.exception('Error expiring %s.', player)
def _expire_teams(self) -> None: def _expire_teams(self) -> None:
# Issue warnings for any teams that left the game but don't # Issue warnings for any teams that left the game but don't
@ -838,7 +838,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
try: try:
team.expire() team.expire()
except Exception: except Exception:
logging.exception("Error expiring %s.", team) logging.exception('Error expiring %s.', team)
try: try:
sessionteam = team.sessionteam sessionteam = team.sessionteam
@ -850,7 +850,7 @@ class Activity(DependencyComponent, Generic[PlayerT, TeamT]):
# player/team has left the game) # player/team has left the game)
pass pass
except Exception: except Exception:
logging.exception("Error expiring Team %s.", team) logging.exception('Error expiring Team %s.', team)
def _prune_delay_deletes(self) -> None: def _prune_delay_deletes(self) -> None:
self._delay_delete_players.clear() self._delay_delete_players.clear()