Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated to fstrings.

Browse source
This commit is contained in:
Kovitikus 2019-09-10 10:31:49 -04:00
parent 6b2c2ee6e3
commit c0a5156c70
1 changed files with 31 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

64
evennia/accounts/accounts.py
View file

@ -269,7 +269,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
return return
if not obj.access(self, 'puppet'): if not obj.access(self, 'puppet'):
# no access # no access
self.msg("You don't have permission to puppet '%s'." % obj.key) self.msg(f"You don't have permission to puppet '{obj.key}'.")
return return
if obj.account: if obj.account:
# object already puppeted # object already puppeted
@ -278,19 +278,19 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
# we may take over another of our sessions # we may take over another of our sessions
# output messages to the affected sessions # output messages to the affected sessions
if _MULTISESSION_MODE in (1, 3): if _MULTISESSION_MODE in (1, 3):
txt1 = "Sharing |c%s|n with another of your sessions." txt1 = f"Sharing |c{obj.name}|n with another of your sessions."
txt2 = "|c%s|n|G is now shared from another of your sessions.|n" txt2 = f"|c{obj.name}|n|G is now shared from another of your sessions.|n"
self.msg(txt1 % obj.name, session=session) self.msg(txt1, session=session)
self.msg(txt2 % obj.name, session=obj.sessions.all()) self.msg(txt2, session=obj.sessions.all())
else: else:
txt1 = "Taking over |c%s|n from another of your sessions." txt1 = f"Taking over |c{obj.name}|n from another of your sessions."
txt2 = "|c%s|n|R is now acted from another of your sessions.|n" txt2 = f"|c{obj.name}|n|R is now acted from another of your sessions.|n"
self.msg(txt1 % obj.name, session=session) self.msg(txt1, session=session)
self.msg(txt2 % obj.name, session=obj.sessions.all()) self.msg(txt2, session=obj.sessions.all())
self.unpuppet_object(obj.sessions.get()) self.unpuppet_object(obj.sessions.get())
elif obj.account.is_connected: elif obj.account.is_connected:
# controlled by another account # controlled by another account
self.msg("|c%s|R is already puppeted by another Account." % obj.key) self.msg(f"|c{obj.key}|R is already puppeted by another Account.")
return return
# do the puppeting # do the puppeting
@ -439,9 +439,9 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
try: try:
klass = import_string(validator['NAME']) klass = import_string(validator['NAME'])
except ImportError: except ImportError:
msg = ("The module in NAME could not be imported: %s. " msg = (f"The module in NAME could not be imported: {validator['NAME']}. "
"Check your AUTH_USERNAME_VALIDATORS setting.") "Check your AUTH_USERNAME_VALIDATORS setting.")
raise ImproperlyConfigured(msg % validator['NAME']) raise ImproperlyConfigured(msg)
objs.append(klass(**validator.get('OPTIONS', {}))) objs.append(klass(**validator.get('OPTIONS', {})))
return objs return objs
@ -494,7 +494,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
# this is a banned IP or name! # this is a banned IP or name!
errors.append("|rYou have been banned and cannot continue from here." errors.append("|rYou have been banned and cannot continue from here."
"\nIf you feel this ban is in error, please email an admin.|x") "\nIf you feel this ban is in error, please email an admin.|x")
logger.log_sec('Authentication Denied (Banned): %s (IP: %s).' % (username, ip)) logger.log_sec(f'Authentication Denied (Banned): {username} (IP: {ip}).')
LOGIN_THROTTLE.update(ip, 'Too many sightings of banned artifact.') LOGIN_THROTTLE.update(ip, 'Too many sightings of banned artifact.')
return None, errors return None, errors
@ -505,7 +505,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
errors.append('Username and/or password is incorrect.') errors.append('Username and/or password is incorrect.')
# Log auth failures while throttle is inactive # Log auth failures while throttle is inactive
logger.log_sec('Authentication Failure: %s (IP: %s).' % (username, ip)) logger.log_sec(f'Authentication Failure: {username} (IP: {ip}).')
# Update throttle # Update throttle
if ip: if ip:
@ -521,7 +521,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
return None, errors return None, errors
# Account successfully authenticated # Account successfully authenticated
logger.log_sec('Authentication Success: %s (IP: %s).' % (account, ip)) logger.log_sec(f'Authentication Success: {account} (IP: {ip}).')
return account, errors return account, errors
@classmethod @classmethod
@ -629,7 +629,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
""" """
super(DefaultAccount, self).set_password(password) super(DefaultAccount, self).set_password(password)
logger.log_sec("Password successfully changed for %s." % self) logger.log_sec(f"Password successfully changed for {self}.")
self.at_password_change() self.at_password_change()
@classmethod @classmethod
@ -706,7 +706,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
try: try:
try: try:
account = create.create_account(username, email, password, permissions=permissions, typeclass=typeclass) account = create.create_account(username, email, password, permissions=permissions, typeclass=typeclass)
logger.log_sec('Account Created: %s (IP: %s).' % (account, ip)) logger.log_sec(f'Account Created: {account} (IP: {ip}).')
except Exception as e: except Exception as e:
errors.append("There was an error creating the Account. If this problem persists, contact an admin.") errors.append("There was an error creating the Account. If this problem persists, contact an admin.")
@ -725,7 +725,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
# join the new account to the public channel # join the new account to the public channel
pchannel = ChannelDB.objects.get_channel(settings.DEFAULT_CHANNELS[0]["key"]) pchannel = ChannelDB.objects.get_channel(settings.DEFAULT_CHANNELS[0]["key"])
if not pchannel or not pchannel.connect(account): if not pchannel or not pchannel.connect(account):
string = "New account '%s' could not connect to public channel!" % account.key string = f"New account '{account.key}' could not connect to public channel!"
errors.append(string) errors.append(string)
logger.log_err(string) logger.log_err(string)
@ -1034,7 +1034,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
updates = [] updates = []
if not cdict.get("key"): if not cdict.get("key"):
if not self.db_key: if not self.db_key:
self.db_key = "#%i" % self.dbid self.db_key = f"#{self.dbid}"
updates.append("db_key") updates.append("db_key")
elif self.key != cdict.get("key"): elif self.key != cdict.get("key"):
updates.append("db_key") updates.append("db_key")
@ -1156,9 +1156,9 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
now = "%02i-%02i-%02i(%02i:%02i)" % (now.year, now.month, now = "%02i-%02i-%02i(%02i:%02i)" % (now.year, now.month,
now.day, now.hour, now.minute) now.day, now.hour, now.minute)
if _MUDINFO_CHANNEL: if _MUDINFO_CHANNEL:
_MUDINFO_CHANNEL.tempmsg("[%s, %s]: %s" % (_MUDINFO_CHANNEL.key, now, message)) _MUDINFO_CHANNEL.tempmsg(f"[{_MUDINFO_CHANNEL.key}, {now}]: {message}")
else: else:
logger.log_info("[%s]: %s" % (now, message)) logger.log_info(f"[{now}]: {message}")
def at_post_login(self, session=None, **kwargs): def at_post_login(self, session=None, **kwargs):
""" """
@ -1185,7 +1185,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
if session: if session:
session.msg(logged_in={}) session.msg(logged_in={})
self._send_to_connect_channel("|G%s connected|n" % self.key) self._send_to_connect_channel(f"|G{self.key} connected|n")
if _MULTISESSION_MODE == 0: if _MULTISESSION_MODE == 0:
# in this mode we should have only one character available. We # in this mode we should have only one character available. We
# try to auto-connect to our last conneted object, if any # try to auto-connect to our last conneted object, if any
@ -1235,8 +1235,8 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
""" """
reason = " (%s)" % reason if reason else "" reason = f" ({reason if reason else ''})"
self._send_to_connect_channel("|R%s disconnected%s|n" % (self.key, reason)) self._send_to_connect_channel(f"|R{self.key} disconnected{reason}|n")
def at_post_disconnect(self, **kwargs): def at_post_disconnect(self, **kwargs):
""" """
@ -1353,12 +1353,12 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
is_su = self.is_superuser is_su = self.is_superuser
# text shown when looking in the ooc area # text shown when looking in the ooc area
result = ["Account |g%s|n (you are Out-of-Character)" % self.key] result = [f"Account |g{self.key}|n (you are Out-of-Character)"]
nsess = len(sessions) nsess = len(sessions)
result.append(nsess == 1 and result.append(nsess == 1 and
"\n\n|wConnected session:|n" or "\n\n|wConnected session:|n" or
"\n\n|wConnected sessions (%i):|n" % nsess) f"\n\n|wConnected sessions ({nsess}):|n")
for isess, sess in enumerate(sessions): for isess, sess in enumerate(sessions):
csessid = sess.sessid csessid = sess.sessid
addr = "%s (%s)" % (sess.protocol_key, isinstance(sess.address, tuple) and addr = "%s (%s)" % (sess.protocol_key, isinstance(sess.address, tuple) and
@ -1385,7 +1385,7 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
string_s_ending = len(characters) > 1 and "s" or "" string_s_ending = len(characters) > 1 and "s" or ""
result.append("\n |w@ic <character>|n - enter the game (|w@ooc|n to get back here)") result.append("\n |w@ic <character>|n - enter the game (|w@ooc|n to get back here)")
if is_su: if is_su:
result.append("\n\nAvailable character%s (%i/unlimited):" % (string_s_ending, len(characters))) result.append(f"\n\nAvailable character{string_s_ending} ({len(characters)}/unlimited):")
else: else:
result.append("\n\nAvailable character%s%s:" result.append("\n\nAvailable character%s%s:"
% (string_s_ending, charmax > 1 and " (%i/%i)" % (len(characters), charmax) or "")) % (string_s_ending, charmax > 1 and " (%i/%i)" % (len(characters), charmax) or ""))
@ -1397,14 +1397,12 @@ class DefaultAccount(with_metaclass(TypeclassBase, AccountDB)):
# character is already puppeted # character is already puppeted
sid = sess in sessions and sessions.index(sess) + 1 sid = sess in sessions and sessions.index(sess) + 1
if sess and sid: if sess and sid:
result.append("\n - |G%s|n [%s] (played by you in session %i)" result.append(f"\n - |G{char.key}|n [{', '.join(char.permissions.all())}] (played by you in session {sid})")
% (char.key, ", ".join(char.permissions.all()), sid))
else: else:
result.append("\n - |R%s|n [%s] (played by someone else)" result.append(f"\n - |R{char.key}|n [{', '.join(char.permissions.all())}] (played by someone else)")
% (char.key, ", ".join(char.permissions.all())))
else: else:
# character is "free to puppet" # character is "free to puppet"
result.append("\n - %s [%s]" % (char.key, ", ".join(char.permissions.all()))) result.append(f"\n - {char.key} [{', '.join(char.permissions.all())}]")
look_string = ("-" * 68) + "\n" + "".join(result) + "\n" + ("-" * 68) look_string = ("-" * 68) + "\n" + "".join(result) + "\n" + ("-" * 68)
return look_string return look_string
@ -1499,7 +1497,7 @@ class DefaultGuest(DefaultAccount):
overriding the call (unused by default). overriding the call (unused by default).
""" """
self._send_to_connect_channel("|G%s connected|n" % self.key) self._send_to_connect_channel(f"|G{self.key} connected|n")
self.puppet_object(session, self.db._last_puppet) self.puppet_object(session, self.db._last_puppet)
def at_server_shutdown(self): def at_server_shutdown(self):