fix a couple typos/tweaks

This commit is contained in:
InspectorCaracal 2022-04-15 13:54:41 -06:00 committed by GitHub
parent e0a9310b1b
commit e7292955ef

View file

@ -693,12 +693,10 @@ class SdescHandler:
""" """
self.sdesc = self.obj.attributes.get("_sdesc", default="") self.sdesc = self.obj.attributes.get("_sdesc", default="")
sdesc_regex = self.obj.attributes.get("_sdesc_regex", default="") sdesc_regex = self.obj.attributes.get("_sdesc_regex", default="")
if self.sdesc: if not sdesc_regex:
self.sdesc_regex = re.compile(sdesc_regex, _RE_FLAGS)
else:
permutation_string = " ".join([self.key] + self.aliases.all()) permutation_string = " ".join([self.key] + self.aliases.all())
self.sdesc_regex = re.compile(ordered_permutation_regex(permutation_string), _RE_FLAGS) sdesc_regex = ordered_permutation_regex(permutation_string)
self.sdesc_regex = re.compile(sdesc_regex, _RE_FLAGS)
def add(self, sdesc, max_length=60): def add(self, sdesc, max_length=60):
""" """
@ -1739,10 +1737,10 @@ class ContribRPCharacter(DefaultCharacter, ContribRPObject):
recog (str): The modified recog string. recog (str): The modified recog string.
""" """
if not sdesc: if not recog:
return "" return ""
return "|m%s|n" % sdesc return "|m%s|n" % recog
def process_language(self, text, speaker, language, **kwargs): def process_language(self, text, speaker, language, **kwargs):
""" """