Fix octal constants syntax (python3 compat)

[projects/pld-ftp-admin.git] / modules / cons.py

diff --git a/modules/cons.py b/modules/cons.py
index f7b1159dad4ae9195ca9e0139d1e0a5462da9e63..8213c68f759b3b44a00b9a83590e55f51abcd1c8 100644 (file)
--- a/modules/cons.py
+++ b/modules/cons.py
@@ -15,17 +15,26 @@ class Connection:
         self.fileno=sock.fileno
         self.name=""
         self.data=""
+
     def destroy(self):
         self.sock.close()
         rm(self)
+
     def handleinput(self):
-        newdata=self.sock.recv(8192)
+        newdata = None
+        try:
+            newdata = self.sock.recv(8192)
+        except:
+            self.destroy()
+
         if not newdata:
             self.destroy()
-        self.data=self.data+newdata
+        else:
+            self.data = self.data + newdata
+
         try:
             cmds.parse(self)
-        except cmds.CmdError:
+        except cmds.BailOut:
             self.destroy()
 
 def add(con):
@@ -38,7 +47,7 @@ def readables():
     lst=cons[:]
     lst.append(privlistener)
     lst.append(publistener)
-    inlst,outlst,errlst = select.select(lst, [], [], 0)
+    inlst,outlst,errlst = select.select(lst, [], [], 0.1)
     return inlst
 
 def createlistener(path):
@@ -49,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