From: Jeremy Stanley <fungi@yuggoth.org>
Date: Sun, 14 May 2017 18:23:24 +0000 (+0000)
Subject: Clear vestigial ord() calls in telopt negotiation
X-Git-Tag: 0.0.1~159
X-Git-Url: https://mudpy.org/gitweb?p=mudpy.git;a=commitdiff_plain;h=dc22daedb7bba8e79e7ec878ec16d3ce57229279

Clear vestigial ord() calls in telopt negotiation

Clean up missed ordinal recasting on telnet options during
negotiation. They're no longer necessary, and crash the service if
triggered.
---

diff --git a/mudpy/telnet.py b/mudpy/telnet.py
index 9feac03..9558101 100644
--- a/mudpy/telnet.py
+++ b/mudpy/telnet.py
@@ -179,10 +179,10 @@ def negotiate_telnet_options(user):
 
         # subnegotiation options
         elif len_text > position + 4 and command is SB:
-            telopt = ord(text[position + 2])
+            telopt = text[position + 2]
             if telopt is TELOPT_NAWS:
                 user.columns = (
-                    ord(text[position + 3]) * 256 + ord(text[position + 4]))
+                    text[position + 3] * 256 + text[position + 4])
             end_subnegotiation = text.find(telnet_proto(IAC, SE), position)
             if end_subnegotiation > 0:
                 text = text[:position] + text[end_subnegotiation + 2:]