Mercurial Repositories > eric / file diff

--- a/eric7/Utilities/FtpUtilities.py	Sat May 22 12:54:57 2021 +0200
+++ b/eric7/Utilities/FtpUtilities.py	Sat May 22 16:52:45 2021 +0200
@@ -11,7 +11,7 @@
 
 from PyQt6.QtCore import QObject, QDate, QDateTime, QTime
 
-from E5Network.E5UrlInfo import E5UrlInfo, E5UrlPermission
+from EricNetwork.EricUrlInfo import EricUrlInfo, EricUrlPermission
 
 
 class FtpDirLineParserError(Exception):
@@ -69,7 +69,7 @@
         given URL info object.
         
         @param modeString mode string to be parsed (string)
-        @param urlInfo reference to the URL info object (E5UrlInfo)
+        @param urlInfo reference to the URL info object (EricUrlInfo)
         @exception FtpDirLineParserError Raised if the mode cannot be parsed.
         """
         if len(modeString) != 10:
@@ -80,23 +80,23 @@
         
         permission = 0
         if modeString[1] != '-':
-            permission |= E5UrlPermission.READ_OWNER
+            permission |= EricUrlPermission.READ_OWNER
         if modeString[2] != '-':
-            permission |= E5UrlPermission.WRITE_OWNER
+            permission |= EricUrlPermission.WRITE_OWNER
         if modeString[3] != '-':
-            permission |= E5UrlPermission.EXE_OWNER
+            permission |= EricUrlPermission.EXE_OWNER
         if modeString[4] != '-':
-            permission |= E5UrlPermission.READ_GROUP
+            permission |= EricUrlPermission.READ_GROUP
         if modeString[5] != '-':
-            permission |= E5UrlPermission.WRITE_GROUP
+            permission |= EricUrlPermission.WRITE_GROUP
         if modeString[6] != '-':
-            permission |= E5UrlPermission.EXE_GROUP
+            permission |= EricUrlPermission.EXE_GROUP
         if modeString[7] != '-':
-            permission |= E5UrlPermission.READ_OTHER
+            permission |= EricUrlPermission.READ_OTHER
         if modeString[8] != '-':
-            permission |= E5UrlPermission.WRITE_OTHER
+            permission |= EricUrlPermission.WRITE_OTHER
         if modeString[9] != '-':
-            permission |= E5UrlPermission.EXE_OTHER
+            permission |= EricUrlPermission.EXE_OTHER
         urlInfo.setPermissions(permission)
         
         if modeString[0] == "d":
@@ -128,7 +128,7 @@
         @param monthAbbreviation abbreviation of the month name (string)
         @param day day of the month (string)
         @param yearOrTime string giving the year or a time (string)
-        @param urlInfo reference to the URL info object (E5UrlInfo)
+        @param urlInfo reference to the URL info object (EricUrlInfo)
         @exception FtpDirLineParserError Raised if the month abbreviation is
             not recognized.
         """
@@ -196,7 +196,7 @@
         Private method to parse a Unix style directory listing line.
         
         @param line directory line to be parsed (string)
-        @return URL info object containing the valid data (E5UrlInfo)
+        @return URL info object containing the valid data (EricUrlInfo)
         """
         modeString, nlink, user, group, size, month, day, yearOrTime, name = (
             self.__splitUnixLine(line)
@@ -205,7 +205,7 @@
         if name in [".", ".."]:
             return None
         
-        urlInfo = E5UrlInfo()
+        urlInfo = EricUrlInfo()
         self.__parseUnixMode(modeString, urlInfo)
         self.__parseUnixTime(month, day, yearOrTime, urlInfo)
         urlInfo.setOwner(user)
@@ -230,7 +230,7 @@
         
         @param date date string (string)
         @param time time string (string)
-        @param urlInfo reference to the URL info object (E5UrlInfo)
+        @param urlInfo reference to the URL info object (EricUrlInfo)
         @exception FtpDirLineParserError Raised if either of the strings is not
             recognized.
         """
@@ -260,7 +260,7 @@
         Private method to parse a Windows style directory listing line.
         
         @param line directory line to be parsed (string)
-        @return URL info object containing the valid data (E5UrlInfo)
+        @return URL info object containing the valid data (EricUrlInfo)
         @exception FtpDirLineParserError Raised if the line is not of a
             recognized Windows format.
         """
@@ -274,7 +274,7 @@
         if name in [".", ".."]:
             return None
         
-        urlInfo = E5UrlInfo()
+        urlInfo = EricUrlInfo()
         self.__parseWindowsTime(date, time, urlInfo)
         if dirOrSize.lower() == "<dir>":
             urlInfo.setDir(True)
@@ -293,15 +293,15 @@
         urlInfo.setSymLink(ext == ".lnk")
         
         permissions = (
-            E5UrlPermission.READ_OWNER | E5UrlPermission.WRITE_OWNER |
-            E5UrlPermission.READ_GROUP | E5UrlPermission.WRITE_GROUP |
-            E5UrlPermission.READ_OTHER | E5UrlPermission.WRITE_OTHER
+            EricUrlPermission.READ_OWNER | EricUrlPermission.WRITE_OWNER |
+            EricUrlPermission.READ_GROUP | EricUrlPermission.WRITE_GROUP |
+            EricUrlPermission.READ_OTHER | EricUrlPermission.WRITE_OTHER
         )
         if ext in [".exe", ".com", ".bat", ".cmd"]:
             permissions |= (
-                E5UrlPermission.EXE_OWNER |
-                E5UrlPermission.EXE_GROUP |
-                E5UrlPermission.EXE_OTHER
+                EricUrlPermission.EXE_OWNER |
+                EricUrlPermission.EXE_GROUP |
+                EricUrlPermission.EXE_OTHER
             )
         urlInfo.setPermissions(permissions)
         
@@ -316,7 +316,7 @@
         to Windows style. If that fails as well, an exception is raised.
         
         @param line directory line to be parsed (string)
-        @return URL info object containing the valid data (E5UrlInfo)
+        @return URL info object containing the valid data (EricUrlInfo)
         """
         if self.__ignoreLine(line):
             return None