Fixed an elusive bug in utils.get_variable_from_module() that caused the connection screen to sometimes not load properly, due to the imported modules being erroneously extracted and used.

src/server/serversession.py

@@ -55,7 +55,6 @@ class ServerSession(Session):
             self.cmdset = cmdsethandler.CmdSetHandler(self)
             self.cmdset_storage = [settings.CMDSET_UNLOGGEDIN]
             self.cmdset.update(init_mode=True)
-            self.cmdset.update(init_mode=True)
             return
 
         character = self.get_character()
@@ -192,7 +191,6 @@ class ServerSession(Session):
 
         # all other inputs, including empty inputs
         character = self.get_character()
-
         if character:
             character.execute_cmd(command_string)
         else:
@@ -227,7 +225,6 @@ class ServerSession(Session):
                    "update_counter", (["counter1"], {"now":True}) }
         """
 
-        print "server: "
         outdata = {}
 
         entity = self.get_character()

src/server/sessionhandler.py

@@ -16,7 +16,6 @@ import time
 from django.conf import settings
 from django.contrib.auth.models import User
 from src.server.models import ServerConfig
-from src.utils import utils
 
 from src.commands.cmdhandler import CMD_LOGINSTART
 
@@ -210,7 +209,7 @@ class ServerSessionHandler(SessionHandler):
                             if sess.logged_in
                             and sess.get_character() == curr_char
                             and sess != curr_session]
-        for sessid in doublet_sessions:
+        for session in doublet_sessions:
             self.disconnect(session, reason)
             self.session_count(-1)
 
@@ -414,6 +413,7 @@ class PortalSessionHandler(SessionHandler):
         in from the protocol to the server. data is
         serialized before passed on.
         """
+        print "portal_data_in:", string
         self.portal.amp_protocol.call_remote_MsgPortal2Server(session.sessid,
                                                               msg=string,
                                                               data=data)
@@ -437,6 +437,7 @@ class PortalSessionHandler(SessionHandler):
         """
         OOB (Out-of-band) data Portal -> Server
         """
+        print "portal_oob_data_in:", data
         self.portal.amp_protocol.call_remote_OOBPortal2Server(session.sessid,
                                                               data=data)
 
@@ -444,6 +445,7 @@ class PortalSessionHandler(SessionHandler):
         """
         OOB (Out-of-band) data Server -> Portal
         """
+        print "portal_oob_data_out:", data
         session = self.sessions.get(sessid, None)
         if session:
             session.oob_data_out(data)

src/server/telnet.py

@@ -78,20 +78,24 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
         starts with IAC (a telnet command) or not. All other data will
         be handled in line mode.
         """
-        # print "dataRcv:", data,
-        # try:
-        #     for b in data:
-        #         print ord(b),
-        #     print ""
-        # except Exception, e:
-        #     print str(e) + ":", str(data)
+        print "dataRcv (%s):" % data,
+        try:
+            for b in data:
+                print ord(b),
+            print ""
+        except Exception, e:
+            print str(e) + ":", str(data)
 
         if data and data[0] == IAC:
             try:
+                print "IAC mode"
                 super(TelnetProtocol, self).dataReceived(data)
                 return
             except Exception:
                 pass
+        # if we get to this point the command must end with a linebreak.
+        #data = data.rstrip("\r\n") + "\r\n"
+        print "line mode: (%s)" % data
         StatefulTelnetProtocol.dataReceived(self, data)
 
     def _write(self, data):