- merged PLD changes

[tld-ftp-admin.git] / modules / cons.py

diff --git a/modules/cons.py b/modules/cons.py
index 61569f6e86c7d543031b701d45edcfd301ffaf05..dae0587db217fa5a6dc3a60e22ac1fc4dce28e55 100644 (file)
--- a/modules/cons.py
+++ b/modules/cons.py
@@ -30,7 +30,7 @@ class Connection:
         if not newdata:
             self.destroy()
         else:
-            self.data = self.data + newdata
+            self.data = self.data + newdata.decode("utf-8")
 
         try:
             cmds.parse(self)
@@ -58,9 +58,9 @@ def createlistener(path):
     s.setblocking(False)
     s.bind(path)
     if path==ftpio.pubsock:
-        os.chmod(path, 0606)
+        os.chmod(path, 0o606)
     else:
-        os.chmod(path, 0600)
+        os.chmod(path, 0o600)
     s.listen(3)
     return s