finish conversion to python 3

This commit is contained in:
2020-01-07 15:43:49 -05:00
parent aab4793fe8
commit 7786b84285
2 changed files with 14 additions and 11 deletions
+9 -8
View File
@@ -16,8 +16,7 @@ import shutil
import zlib
import subprocess
import syslog
import syslog
import codecs
PORT = 50003
@@ -136,7 +135,7 @@ def dicttos(ID, d):
def stodict(msg):
d = {}
if len(msg) > 0 and msg[0] == "!":
if len(msg) > 0 and chr(msg[0]) == "!":
pk = zlib.decompress(msg[5:]).decode()
d['ID'] = msg[1:4].decode()
else:
@@ -151,8 +150,10 @@ def stodict(msg):
d[k] = None
else:
v = vr[1].strip()
if v[0].isdigit():
try:
v = eval(v)
except:
pass
d[k] = v
if verbose: print("msg is %s" % d)
return d
@@ -241,7 +242,7 @@ def doexec(conn, data):
def doupdate(conn, msgDict):
fail = None
try:
code = msgDict['code'].decode('base64')
code = codecs.decode(msgDict['code'],'base64').decode()
csum = msgDict['csum']
except:
fail = "csum/code missing"
@@ -258,8 +259,8 @@ def doupdate(conn, msgDict):
def doupdateone(code, csum):
m = md5.new()
m.update(code)
m = md5()
m.update(code.encode())
icsum = m.hexdigest()
if icsum != csum:
return "checksum error"
@@ -330,7 +331,7 @@ def process():
for rfh in r[0]:
conn = conIds[rfh]
data, addr = ifiles[rfh].recvfrom(MAXRECV)
# if verbose: print("sock.recvfrom: %s (%s) %s" % (addr, len(data), data[:4]))
if verbose: print("sock.recvfrom: %s (%s) %s" % (addr, len(data), data[:4]))
try:
msgDict = stodict(data)
except Exception as e: