(1, r'says, "\[35mfoo\[0m\."', ""),
)
+test_escape_macros = (
+ (0, '> ', "say $(red)bar$(nrm)"),
+ (1, r'says, "\$\(red\)bar\$\(nrm\)."', ""),
+)
+
test_movement = (
(0, "> ", "move north"),
(0, r"You exit to the north\.", ""),
test_preferences = (
(0, "> ", "preferences"),
- (0, r"prompt \x1b\[32m.*> ", "preferences prompt #"),
- (0, r"# ", "preferences prompt"),
- (0, r"#.*# ", "preferences prompt >"),
+ (0, r"prompt \x1b\[32m.*> ", "preferences prompt $(foo)"),
+ (0, r"\$\(foo\) ", "preferences prompt"),
+ (0, r"\$\(foo\).*\$\(foo\) ", "preferences prompt >"),
(2, "> ", "preferences loglevel 0"),
(2, "> ", "preferences"),
(2, r"loglevel \x1b\[32m0\x1b\[0m.*> ", "preferences loglevel zero"),
(test_chat_mode, "chat mode"),
(test_wrapping, "wrapping"),
(test_forbid_ansi_input, "raw escape input is filtered"),
+ (test_escape_macros, "replacement macros are escaped"),
(test_movement, "movement"),
(test_actor_disappears, "actor spontaneous disappearance"),
(test_account1_teardown, "second account teardown"),
# any response to avoid endlessly looping
pass
elif command in (telnetlib.DO, telnetlib.DONT):
- telnet_socket.send(b"%s%s%s" % (telnetlib.IAC, telnetlib.WONT, option))
+ telnet_socket.send(telnetlib.IAC + telnetlib.WONT + option)
elif command in (telnetlib.WILL, telnetlib.WONT):
- telnet_socket.send(b"%s%s%s" % (telnetlib.IAC, telnetlib.DONT, option))
+ telnet_socket.send(telnetlib.IAC + telnetlib.DONT + option)
def main():