From e9c66530cd009e186066f6bf5ce7943ce961bdc8 Mon Sep 17 00:00:00 2001 From: Ben Longden Date: Thu, 22 Apr 2021 11:01:21 +0100 Subject: [PATCH] FORCEENDLINE is True by default so no need to set Test also updated to check FORCEENDLINE after TTYPE is negotiated --- evennia/server/portal/tests.py | 3 +-- evennia/server/portal/ttype.py | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/evennia/server/portal/tests.py b/evennia/server/portal/tests.py index 6bd76db827..a67f1a4490 100644 --- a/evennia/server/portal/tests.py +++ b/evennia/server/portal/tests.py @@ -231,7 +231,6 @@ class TestTelnet(TwistedTestCase): self.transport.client = ["localhost"] self.transport.setTcpKeepAlive = Mock() d = self.proto.makeConnection(self.transport) - # test suppress_ga self.assertTrue(self.proto.protocol_flags["NOGOAHEAD"]) self.proto.dataReceived(IAC + DONT + SUPPRESS_GA) @@ -246,13 +245,13 @@ class TestTelnet(TwistedTestCase): self.assertEqual(self.proto.protocol_flags["SCREENHEIGHT"][0], 45) self.assertEqual(self.proto.handshakes, 6) # test ttype - self.assertTrue(self.proto.protocol_flags["FORCEDENDLINE"]) self.assertFalse(self.proto.protocol_flags["TTYPE"]) self.assertTrue(self.proto.protocol_flags["ANSI"]) self.proto.dataReceived(IAC + WILL + TTYPE) self.proto.dataReceived(b"".join([IAC, SB, TTYPE, IS, b"MUDLET", IAC, SE])) self.assertTrue(self.proto.protocol_flags["XTERM256"]) self.assertEqual(self.proto.protocol_flags["CLIENTNAME"], "MUDLET") + self.assertTrue(self.proto.protocol_flags["FORCEDENDLINE"]) self.proto.dataReceived(b"".join([IAC, SB, TTYPE, IS, b"XTERM", IAC, SE])) self.proto.dataReceived(b"".join([IAC, SB, TTYPE, IS, b"MTTS 137", IAC, SE])) self.assertEqual(self.proto.handshakes, 5) diff --git a/evennia/server/portal/ttype.py b/evennia/server/portal/ttype.py index 0b0683b637..04d78b497f 100644 --- a/evennia/server/portal/ttype.py +++ b/evennia/server/portal/ttype.py @@ -119,10 +119,6 @@ class Ttype(object): if clientname.startswith("MUDLET"): # supports xterm256 stably since 1.1 (2010?) xterm256 = clientname.split("MUDLET", 1)[1].strip() >= "1.1" - self.protocol.protocol_flags["FORCEDENDLINE"] = True - - if clientname.startswith("TINTIN++"): - self.protocol.protocol_flags["FORCEDENDLINE"] = True if ( clientname.startswith("XTERM")