From 45860f93b7e1c505359917f1ed90562a0b0d31ff Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 24 Feb 2012 08:59:36 +0000 Subject: [PATCH] Use strings not unicode in telnet service module * lib/mudpy/telnet.py: Python 3000 treats strings as unicode by default, so we should too. --- lib/mudpy/telnet.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/mudpy/telnet.py b/lib/mudpy/telnet.py index e7a0c86..d6abd5a 100644 --- a/lib/mudpy/telnet.py +++ b/lib/mudpy/telnet.py @@ -1,7 +1,7 @@ # -*- 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 . Permission +# Copyright (c) 2004-2012 Jeremy Stanley . Permission # to use, copy, modify, and distribute this software is granted under # terms provided in the LICENSE file distributed with this software. @@ -48,18 +48,18 @@ US = 1 def telnet_proto(*arguments): - u"""Return a concatenated series of Telnet protocol commands.""" + """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]) 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) @@ -70,7 +70,7 @@ def is_enabled(user, telopt, party, state=YES): 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: @@ -87,7 +87,7 @@ def enable(user, telopt, party): 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 @@ -105,7 +105,7 @@ def disable(user, telopt, party): def negotiate_telnet_options(user): - u"""Reply to and remove telnet negotiation options from partial_input.""" + """Reply to and remove telnet negotiation options from partial_input.""" import misc # make a local copy to play with @@ -198,7 +198,7 @@ def negotiate_telnet_options(user): # otherwise, strip out a two-byte IAC command elif len_text > position + 2: - misc.log(u"Unknown Telnet IAC command %s ignored." % command) + 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 -- 2.11.0