Mercurial Repositories > eric / file comparison
comparison: eric6/WebBrowser/Sync/SyncHandler.py
eric6/WebBrowser/Sync/SyncHandler.py
- changeset 7785
- 9978016560ec
- parent 7781
- 607a6098cb44
- child 7836
- 2f0d208b8137
equal
deleted
inserted
replaced
| 7784:3257703e10c5 | 7785:9978016560ec |
|---|---|
| 206 "speeddial") | 206 "speeddial") |
| 207 @return data of the file, optionally encrypted (QByteArray) | 207 @return data of the file, optionally encrypted (QByteArray) |
| 208 """ | 208 """ |
| 209 if os.path.exists(fileName): | 209 if os.path.exists(fileName): |
| 210 try: | 210 try: |
| 211 inputFile = open(fileName, "rb") | 211 with open(fileName, "rb") as inputFile: |
| 212 data = inputFile.read() | 212 data = inputFile.read() |
| 213 inputFile.close() | |
| 214 except IOError: | 213 except IOError: |
| 215 return QByteArray() | 214 return QByteArray() |
| 216 | 215 |
| 217 if ( | 216 if ( |
| 218 Preferences.getWebBrowser("SyncEncryptData") and | 217 Preferences.getWebBrowser("SyncEncryptData") and |
| 269 keyLength=Preferences.getWebBrowser("SyncEncryptionKeyLength")) | 268 keyLength=Preferences.getWebBrowser("SyncEncryptionKeyLength")) |
| 270 if not ok: | 269 if not ok: |
| 271 return False, self.tr("Data cannot be decrypted.") | 270 return False, self.tr("Data cannot be decrypted.") |
| 272 | 271 |
| 273 try: | 272 try: |
| 274 outputFile = open(fileName, "wb") | 273 with open(fileName, "wb") as outputFile: |
| 275 outputFile.write(data) | 274 outputFile.write(data) |
| 276 outputFile.close() | |
| 277 if timestamp > 0: | 275 if timestamp > 0: |
| 278 os.utime(fileName, (timestamp, timestamp)) | 276 os.utime(fileName, (timestamp, timestamp)) |
| 279 return True, "" | 277 return True, "" |
| 280 except IOError as error: | 278 except IOError as error: |
| 281 return False, str(error) | 279 return False, str(error) |
