# -*- coding: utf-8 -*-
-u"""Telnet functions and constants for the mudpy engine."""
+"""Telnet functions and constants for the mudpy engine."""
-# Copyright (c) 2004-2011 Jeremy Stanley <fungi@yuggoth.org>. Permission
+# Copyright (c) 2004-2013 Jeremy Stanley <fungi@yuggoth.org>. Permission
# to use, copy, modify, and distribute this software is granted under
# terms provided in the LICENSE file distributed with this software.
def telnet_proto(*arguments):
- u"""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 a concatenated series of Telnet protocol commands."""
+ return bytes((arguments))
def send_command(user, *command):
- u"""Sends a Telnet command string to the specified user's socket."""
+ """Sends a Telnet command string to the specified user's socket."""
user.send(telnet_proto(IAC, *command), raw=True)
def is_enabled(user, telopt, party, state=YES):
- u"""Returns True if the indicated Telnet option is enabled, False if
+ """Returns True if the indicated Telnet option is enabled, False if
not."""
if (telopt, party) in user.telopts and user.telopts[
(telopt, party)
def enable(user, telopt, party):
- u"""Negotiates enabling a Telnet option for the indicated user's socket."""
+ """Negotiates enabling a Telnet option for the indicated user's socket."""
if party is HIM:
txpos = DO
else:
def disable(user, telopt, party):
- u"""Negotiates disabling a Telnet option for the indicated user's
+ """Negotiates disabling a Telnet option for the indicated user's
socket."""
if party is HIM:
txneg = DONT
def negotiate_telnet_options(user):
- u"""Reply to and remove telnet negotiation options from partial_input."""
- import misc
+ """Reply to and remove telnet negotiation options from partial_input."""
+ import mudpy.misc
# make a local copy to play with
text = user.partial_input
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:
# 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
# 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)
# otherwise, strip out a two-byte IAC command
elif len_text > position + 2:
- misc.log(u"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