X-Git-Url: https://mudpy.org/gitweb?a=blobdiff_plain;f=lib%2Fmudpy%2Ftelnet.py;h=9feac03c2d3d5fb62163788b7c20bd933b4e0048;hb=3b16769152e6f5bff553a37d0e69f35dee28dc29;hp=471f9fd5743fc37f986ac6773155829b0eeebb02;hpb=2a1119763de7805f617d8b62b8f0822969f3d7df;p=mudpy.git

diff --git a/lib/mudpy/telnet.py b/lib/mudpy/telnet.py
index 471f9fd..9feac03 100644
--- a/lib/mudpy/telnet.py
+++ b/lib/mudpy/telnet.py
@@ -1,7 +1,6 @@
-# -*- coding: utf-8 -*-
 """Telnet functions and constants for the mudpy engine."""
 
-# Copyright (c) 2004-2013 Jeremy Stanley <fungi@yuggoth.org>. Permission
+# Copyright (c) 2004-2015 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.
 
@@ -60,8 +59,7 @@ def send_command(user, *command):
 
 
 def is_enabled(user, telopt, party, state=YES):
-    """Returns True if the indicated Telnet option is enabled, False if
-        not."""
+    """Indicates whether a specified Telnet option is enabled."""
     if (telopt, party) in user.telopts and user.telopts[
        (telopt, party)
        ] is state:
@@ -88,8 +86,7 @@ def enable(user, telopt, party):
 
 
 def disable(user, telopt, party):
-    """Negotiates disabling a Telnet option for the indicated user's
-        socket."""
+    """Negotiates disabling a Telnet option for the user's socket."""
     if party is HIM:
         txneg = DONT
     else:
@@ -184,8 +181,8 @@ def negotiate_telnet_options(user):
         elif len_text > position + 4 and command is SB:
             telopt = ord(text[position + 2])
             if telopt is TELOPT_NAWS:
-                user.columns = ord(text[position + 3]) * \
-                    256 + ord(text[position + 4])
+                user.columns = (
+                    ord(text[position + 3]) * 256 + ord(text[position + 4]))
             end_subnegotiation = text.find(telnet_proto(IAC, SE), position)
             if end_subnegotiation > 0:
                 text = text[:position] + text[end_subnegotiation + 2:]