From 4181941806f0a683202c577b4886d72686a7e38a Mon Sep 17 00:00:00 2001 From: Griatch Date: Mon, 29 Jan 2018 23:52:06 +0100 Subject: [PATCH 1/2] Slight rephrasing in the crypto install error message --- evennia/server/portal/ssh.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/server/portal/ssh.py b/evennia/server/portal/ssh.py index 29bd3eac87..97d12ada7e 100644 --- a/evennia/server/portal/ssh.py +++ b/evennia/server/portal/ssh.py @@ -20,9 +20,9 @@ from twisted.conch.interfaces import IConchUser _SSH_IMPORT_ERROR = """ ERROR: Missing crypto library for SSH. Install it with - pip install cryptography + pip install cryptography pyasn1 -(On older Twisted versions you may have to do 'pip install pycrypto pyasn1 instead). +(On older Twisted versions you may have to do 'pip install pycrypto pyasn1' instead). If you get a compilation error you must install a C compiler and the SSL dev headers (On Debian-derived systems this is the gcc and libssl-dev From 5aaa0fcfee6082a3a2259a6562c459c5f21fb591 Mon Sep 17 00:00:00 2001 From: Griatch Date: Tue, 30 Jan 2018 18:22:24 +0100 Subject: [PATCH 2/2] Make FORCEDENDLINE default for clients we don't know for sure don't want a cr+nl at the end of the telnet line --- evennia/server/portal/ttype.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/evennia/server/portal/ttype.py b/evennia/server/portal/ttype.py index b07384ab26..d143b69747 100644 --- a/evennia/server/portal/ttype.py +++ b/evennia/server/portal/ttype.py @@ -100,10 +100,6 @@ class Ttype(object): # just start the request chain self.protocol.requestNegotiation(TTYPE, SEND) - # for clients that support TTYPE we assume this is not needed - # (they can set it manually if so) - self.protocol.protocol_flags["FORCEDENDLINE"] = False - elif self.ttype_step == 1: # this is supposed to be the name of the client/terminal. # For clients not supporting the extended TTYPE @@ -117,10 +113,10 @@ class Ttype(object): if cupper.startswith("MUDLET"): # supports xterm256 stably since 1.1 (2010?) xterm256 = cupper.split("MUDLET", 1)[1].strip() >= "1.1" + self.protocol.protocol_flags["FORCEDENDLINE"] = False - if cupper.startswith("TINYFUGUE"): - # tinyfugue expects _GA + endline - self.protocol.protocol_flags["FORCEDENDLINE"] = True + if cupper.startswith("TINTIN++"): + self.protocol.protocol_flags["FORCEDENDLINE"] = False if (cupper.startswith("XTERM") or cupper.endswith("-256COLOR") or