switch some utils.irc functions to use f-strings

This commit is contained in:
jesopo 2019-11-18 14:16:30 +00:00
parent d89a3125ab
commit fe25c6bc26

View file

@ -38,8 +38,7 @@ def color(s: str, foreground: consts.IRCColor,
if background: if background:
background_s = ",%s" % str(background.irc).zfill(2) background_s = ",%s" % str(background.irc).zfill(2)
return "%s%s%s%s%s" % (consts.COLOR, foreground_s, background_s, s, return f"{consts.COLOR}{foreground_s}{background_s}{s}{consts.COLOR}"
consts.COLOR)
HASH_STOP = ["_", "|", "["] HASH_STOP = ["_", "|", "["]
HASH_COLORS = [consts.CYAN, consts.PURPLE, consts.GREEN, consts.ORANGE, HASH_COLORS = [consts.CYAN, consts.PURPLE, consts.GREEN, consts.ORANGE,
@ -55,10 +54,10 @@ def hash_colorize(s: str):
return color(s, HASH_COLORS[hash%len(HASH_COLORS)]) return color(s, HASH_COLORS[hash%len(HASH_COLORS)])
def bold(s: str) -> str: def bold(s: str) -> str:
return "%s%s%s" % (consts.BOLD, s, consts.BOLD) return f"{consts.BOLD}{s}{consts.BOLD}"
def underline(s: str) -> str: def underline(s: str) -> str:
return "%s%s%s" % (consts.UNDERLINE, s, consts.UNDERLINE) return f"{consts.UNDERLINE}{s}{consts.UNDERLINE}"
def strip_font(s: str) -> str: def strip_font(s: str) -> str:
s = s.replace(consts.BOLD, "") s = s.replace(consts.BOLD, "")