Mercurial Repositories > eric / file comparison
comparison: Utilities/FtpUtilities.py
Utilities/FtpUtilities.py
- changeset 2051
- 644d5a2585a8
- parent 2050
- 585f6646bf50
- child 2052
- b89c21c96127
equal
deleted
inserted
replaced
| 2050:585f6646bf50 | 2051:644d5a2585a8 |
|---|---|
| 195 recognized Unix format. | 195 recognized Unix format. |
| 196 """ | 196 """ |
| 197 modeString, nlink, user, group, size, month, day, \ | 197 modeString, nlink, user, group, size, month, day, \ |
| 198 yearOrTime, name = self.__splitUnixLine(line) | 198 yearOrTime, name = self.__splitUnixLine(line) |
| 199 | 199 |
| 200 if name in [".", ".."]: | |
| 201 return None | |
| 202 | |
| 200 urlInfo = QUrlInfo() | 203 urlInfo = QUrlInfo() |
| 201 self.__parseUnixMode(modeString, urlInfo) | 204 self.__parseUnixMode(modeString, urlInfo) |
| 202 self.__parseUnixTime(month, day, yearOrTime, urlInfo) | 205 self.__parseUnixTime(month, day, yearOrTime, urlInfo) |
| 203 urlInfo.setOwner(user) | 206 urlInfo.setOwner(user) |
| 204 urlInfo.setGroup(group) | 207 urlInfo.setGroup(group) |
| 260 try: | 263 try: |
| 261 date, time, dirOrSize, name = line.split(None, 3) | 264 date, time, dirOrSize, name = line.split(None, 3) |
| 262 except ValueError: | 265 except ValueError: |
| 263 # "unpack list of wrong size" | 266 # "unpack list of wrong size" |
| 264 raise FtpDirLineParserError("line '{0}' cannot be parsed".format(line)) | 267 raise FtpDirLineParserError("line '{0}' cannot be parsed".format(line)) |
| 268 | |
| 269 if name in [".", ".."]: | |
| 270 return None | |
| 265 | 271 |
| 266 urlInfo = QUrlInfo() | 272 urlInfo = QUrlInfo() |
| 267 self.__parseWindowsTime(date, time, urlInfo) | 273 self.__parseWindowsTime(date, time, urlInfo) |
| 268 if dirOrSize.lower() == "<dir>": | 274 if dirOrSize.lower() == "<dir>": |
| 269 urlInfo.setDir(True) | 275 urlInfo.setDir(True) |
