Mercurial Repositories > eric / file diff

--- a/eric6/Utilities/FtpUtilities.py	Tue Apr 27 17:42:00 2021 +0200
+++ b/eric6/Utilities/FtpUtilities.py	Wed Apr 28 19:42:28 2021 +0200
@@ -11,7 +11,7 @@
 
 from PyQt5.QtCore import QObject, QDate, QDateTime, QTime
 
-from E5Network.E5UrlInfo import E5UrlInfo
+from E5Network.E5UrlInfo import E5UrlInfo, E5UrlPermission
 
 
 class FtpDirLineParserError(Exception):
@@ -80,23 +80,23 @@
         
         permission = 0
         if modeString[1] != '-':
-            permission |= E5UrlInfo.ReadOwner
+            permission |= E5UrlPermission.READ_OWNER
         if modeString[2] != '-':
-            permission |= E5UrlInfo.WriteOwner
+            permission |= E5UrlPermission.WRITE_OWNER
         if modeString[3] != '-':
-            permission |= E5UrlInfo.ExeOwner
+            permission |= E5UrlPermission.EXE_OWNER
         if modeString[4] != '-':
-            permission |= E5UrlInfo.ReadGroup
+            permission |= E5UrlPermission.READ_GROUP
         if modeString[5] != '-':
-            permission |= E5UrlInfo.WriteGroup
+            permission |= E5UrlPermission.WRITE_GROUP
         if modeString[6] != '-':
-            permission |= E5UrlInfo.ExeGroup
+            permission |= E5UrlPermission.EXE_GROUP
         if modeString[7] != '-':
-            permission |= E5UrlInfo.ReadOther
+            permission |= E5UrlPermission.READ_OTHER
         if modeString[8] != '-':
-            permission |= E5UrlInfo.WriteOther
+            permission |= E5UrlPermission.WRITE_OTHER
         if modeString[9] != '-':
-            permission |= E5UrlInfo.ExeOther
+            permission |= E5UrlPermission.EXE_OTHER
         urlInfo.setPermissions(permission)
         
         if modeString[0] == "d":
@@ -292,12 +292,16 @@
         ext = os.path.splitext(name.lower())[1]
         urlInfo.setSymLink(ext == ".lnk")
         
-        permissions = (E5UrlInfo.ReadOwner | E5UrlInfo.WriteOwner |
-                       E5UrlInfo.ReadGroup | E5UrlInfo.WriteGroup |
-                       E5UrlInfo.ReadOther | E5UrlInfo.WriteOther)
+        permissions = (
+            E5UrlPermission.READ_OWNER | E5UrlPermission.WRITE_OWNER |
+            E5UrlPermission.READ_GROUP | E5UrlPermission.WRITE_GROUP |
+            E5UrlPermission.READ_OTHER | E5UrlPermission.WRITE_OTHER
+        )
         if ext in [".exe", ".com", ".bat", ".cmd"]:
             permissions |= (
-                E5UrlInfo.ExeOwner | E5UrlInfo.ExeGroup | E5UrlInfo.ExeOther
+                E5UrlPermission.EXE_OWNER |
+                E5UrlPermission.EXE_GROUP |
+                E5UrlPermission.EXE_OTHER
             )
         urlInfo.setPermissions(permissions)