Merge branch 'master' into develop

This commit is contained in:
Griatch 2017-10-13 23:11:34 +02:00
commit a447a22c87

View file

@ -3,7 +3,6 @@ This connects to an IRC network/channel and launches an 'bot' onto it.
The bot then pipes what is being said between the IRC channel and one or The bot then pipes what is being said between the IRC channel and one or
more Evennia channels. more Evennia channels.
""" """
from __future__ import print_function
from future.utils import viewkeys, viewvalues, viewitems from future.utils import viewkeys, viewvalues, viewitems
import re import re
@ -144,9 +143,7 @@ def parse_irc_to_ansi(string):
return ANSI_COLOR_MAP.get(irc_match.group(), "") return ANSI_COLOR_MAP.get(irc_match.group(), "")
in_string = utils.to_str(string) in_string = utils.to_str(string)
print("parse_irc_to_ansi (before): %s" % in_string)
pstring = RE_IRC_COLOR.sub(_sub_to_ansi, in_string) pstring = RE_IRC_COLOR.sub(_sub_to_ansi, in_string)
print("parse_irc_to_ansi (after): %s" % pstring)
return pstring return pstring