Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Sync/SyncHandler.py
Helpviewer/Sync/SyncHandler.py
- changeset 3034
- 7ce719013078
- parent 3022
- 57179e4cdadd
- child 3060
- 5883ce99ee12
- child 3160
- 209a07d7e401
equal
deleted
inserted
replaced
| 3033:58fe260e7469 | 3034:7ce719013078 |
|---|---|
| 213 inputFile.close() | 213 inputFile.close() |
| 214 except IOError: | 214 except IOError: |
| 215 return QByteArray() | 215 return QByteArray() |
| 216 | 216 |
| 217 if Preferences.getHelp("SyncEncryptData") and \ | 217 if Preferences.getHelp("SyncEncryptData") and \ |
| 218 (not Preferences.getHelp("SyncEncryptPasswordsOnly") or \ | 218 (not Preferences.getHelp("SyncEncryptPasswordsOnly") or |
| 219 (Preferences.getHelp("SyncEncryptPasswordsOnly") and \ | 219 (Preferences.getHelp("SyncEncryptPasswordsOnly") and |
| 220 type_ == "passwords")): | 220 type_ == "passwords")): |
| 221 key = Preferences.getHelp("SyncEncryptionKey") | 221 key = Preferences.getHelp("SyncEncryptionKey") |
| 222 if not key: | 222 if not key: |
| 223 return QByteArray() | 223 return QByteArray() |
| 224 | 224 |
| 251 """ | 251 """ |
| 252 data = bytes(data) | 252 data = bytes(data) |
| 253 | 253 |
| 254 if Preferences.getHelp("SyncEncryptData") and \ | 254 if Preferences.getHelp("SyncEncryptData") and \ |
| 255 (not Preferences.getHelp("SyncEncryptPasswordsOnly") or | 255 (not Preferences.getHelp("SyncEncryptPasswordsOnly") or |
| 256 (Preferences.getHelp("SyncEncryptPasswordsOnly") and | 256 (Preferences.getHelp("SyncEncryptPasswordsOnly") and |
| 257 type_ == "passwords")): | 257 type_ == "passwords")): |
| 258 key = Preferences.getHelp("SyncEncryptionKey") | 258 key = Preferences.getHelp("SyncEncryptionKey") |
| 259 if not key: | 259 if not key: |
| 260 return False, self.trUtf8("Invalid encryption key given.") | 260 return False, self.trUtf8("Invalid encryption key given.") |
| 261 | 261 |
