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.

This commit is contained in:
Griatch 2012-04-15 19:05:50 +02:00
parent 5264dc85bb
commit 6501f30cbc
7 changed files with 80 additions and 78 deletions

View file

@ -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):