X-Git-Url: https://mudpy.org/gitweb?a=blobdiff_plain;f=lib%2Fmudpy%2Ftelnet.py;h=3ce73a308b85ef390ae1d3c9f57c539ef38b8483;hb=4eb4a44bb63c666d6b4cbb6816d3082449dcdccb;hp=043c86be3a7cf80277c53b0dc28913b15fd4f69c;hpb=a9c695831c3cce25df4c487100525c618a926b3b;p=mudpy.git

diff --git a/lib/mudpy/telnet.py b/lib/mudpy/telnet.py
index 043c86b..3ce73a3 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 <fungi@yuggoth.org>. Permission
+# Copyright (c) 2004-2012 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.
 
@@ -48,18 +48,19 @@ 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 not."""
+    """Returns True if the indicated Telnet option is enabled, False if
+        not."""
     if (telopt, party) in user.telopts and user.telopts[
        (telopt, party)
        ] is state:
@@ -69,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:
@@ -86,7 +87,8 @@ def enable(user, telopt, party):
 
 
 def disable(user, telopt, party):
-    u"""Negotiates disabling a Telnet option for the indicated user's socket."""
+    """Negotiates disabling a Telnet option for the indicated user's
+        socket."""
     if party is HIM:
         txneg = DONT
     else:
@@ -103,8 +105,8 @@ def disable(user, telopt, party):
 
 
 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
@@ -196,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)
+            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