pubsock=config.value['pubsock']
-if os.environ.has_key('HOME'):
+if 'HOME' in os.environ:
privsock=os.environ['HOME']+'/tld-ftp-admin/var/privsock'
socketname=privsock
else:
sock.connect(socketname)
if not name:
name = "pid_%d_name_%s" % (os.getpid(), sys.argv[0])
- sock.send('name %s\0' % name)
+ sock.send(bytearray('name %s\0' % name, encoding='utf-8'))
def login_passwd(login, passwd):
'Return cookie if ok'
- sock.send('linp %s\n%s\0' % (login, passwd))
- retval=sock.recv(256)
+ sock.send(bytearray('linp %s\n%s\0' % (login, passwd), encoding='utf-8'))
+ retval=sock.recv(256).decode("utf-8")
if retval=='FAIL':
return ''
else:
def login_cookie(cookie):
'Return login if ok'
- sock.send('linc %s\0' % cookie)
- retval=sock.recv(256)
+ sock.send(bytearray('linc %s\0' % cookie, encoding='utf-8'))
+ retval=sock.recv(256).decode('utf-8')
if retval=='FAIL':
return ''
else:
return retval[3:]
def logout():
- sock.send('lout\0')
+ sock.send(bytearray('lout\0', encoding='utf-8'))
def lock(path, hard=False):
def dolock():
if hard:
- sock.send('lckh %s\0' % path)
+ sock.send(bytearray('lckh %s\0' % path, encoding='utf-8'))
else:
- sock.send('lcks %s\0' % path)
- return sock.recv(20)
+ sock.send(bytearray('lcks %s\0' % path, encoding='utf-8'))
+ return sock.recv(20).decode("utf-8")
for i in range(3):
retcode=dolock()
if retcode=="OK":
return False
def unlock(path):
- sock.send('ulck %s\0' % path)
- ret = sock.recv(20)
+ sock.send(bytearray('ulck %s\0' % path, encoding='utf-8'))
+ ret = sock.recv(20).decode("utf-8")
if ret == "OK":
return True
return False
def log(msg):
- sock.send('log1 %s\0' % msg)
+ sock.send(bytearray('log1 %s\0' % msg, encoding='utf-8'))
def locks_dump():
- sock.send('slck\0')
- ret = sock.recv(4096)
+ sock.send(bytearray('slck\0', encoding='utf-8'))
+ ret = sock.recv(4096).decode("utf-8")
if ret == "NLCK":
return "No locks held"
# nbytes = int(ret.split("BLOB:")[1])
-# ret = sock.recv(nbytes)
+# ret = sock.recv(nbytes).decode("utf-8")
return ret
def gettree():
- sock.send('gett\0')
+ sock.send(bytearray('gett\0', encoding='utf-8'))
pkgs=[]
- len=int(sock.recv(6))
+ len=int(sock.recv(6).decode("utf-8"))
if len:
- for pkg in sock.recv(len).split('\0'):
+ for pkg in sock.recv(len).decode("utf-8").split('\0'):
tmp=pkg.split('\n')
pkgs.append((tmp[0], int(tmp[1]), int(tmp[2])))
return pkgs