X-Git-Url: https://mudpy.org/gitweb?a=blobdiff_plain;f=lib%2Fmudpy%2Ftelnet.py;h=77655719254aa7768ae750a782501c7d55cbcebe;hb=d14168d58aedb181e31b224240667a68c0ec0bfa;hp=d6abd5a6ba4bb73d3d5255be1de17f75f5187927;hpb=3c879d884195aa12d4878e6e06d86e493bbf246c;p=mudpy.git diff --git a/lib/mudpy/telnet.py b/lib/mudpy/telnet.py index d6abd5a..7765571 100644 --- a/lib/mudpy/telnet.py +++ b/lib/mudpy/telnet.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Telnet functions and constants for the mudpy engine.""" -# Copyright (c) 2004-2012 Jeremy Stanley . Permission +# Copyright (c) 2004-2013 Jeremy Stanley . Permission # to use, copy, modify, and distribute this software is granted under # terms provided in the LICENSE file distributed with this software. @@ -49,8 +49,7 @@ US = 1 def telnet_proto(*arguments): """Return a concatenated series of Telnet protocol commands.""" - # (this will need to be byte type during 2to3 migration) - return "".join([chr(x) for x in arguments]) + return bytes((arguments)) def send_command(user, *command): @@ -106,7 +105,7 @@ def disable(user, telopt, party): def negotiate_telnet_options(user): """Reply to and remove telnet negotiation options from partial_input.""" - import misc + import mudpy.misc # make a local copy to play with text = user.partial_input @@ -126,8 +125,7 @@ def negotiate_telnet_options(user): break # the byte following the IAC is our command - # (this will need to be byte type during 2to3 migration) - command = ord(text[position + 1]) + command = text[position+1] # replace a double (literal) IAC if there's an LF later if command is IAC: @@ -139,8 +137,7 @@ def negotiate_telnet_options(user): # implement an RFC 1143 option negotiation queue here elif len_text > position + 2 and WILL <= command <= DONT: - # this will need to be byte type during 2to3 migration - telopt = ord(text[position + 2]) + telopt = text[position+2] if telopt in supported: if command <= WONT: party = HIM @@ -184,10 +181,8 @@ def negotiate_telnet_options(user): # subnegotiation options elif len_text > position + 4 and command is SB: - # this will need to be byte type during 2to3 migration telopt = ord(text[position + 2]) if telopt is TELOPT_NAWS: - # this will need to be byte type during 2to3 migration user.columns = ord(text[position + 3]) * \ 256 + ord(text[position + 4]) end_subnegotiation = text.find(telnet_proto(IAC, SE), position) @@ -198,7 +193,7 @@ def negotiate_telnet_options(user): # otherwise, strip out a two-byte IAC command elif len_text > position + 2: - misc.log("Unknown Telnet IAC command %s ignored." % command) + mudpy.misc.log("Unknown Telnet IAC command %s ignored." % command) text = text[:position] + text[position + 2:] # and this means we got the begining of an IAC