Mercurial Repositories > eric / file comparison
comparison: Preferences/__init__.py
Preferences/__init__.py
- changeset 6522
- 20c9a023b6c1
- parent 6424
- 5e74c4e22e9a
- child 6525
- ca6d66fee883
- child 6537
- 61a8d416dd34
equal
deleted
inserted
replaced
| 6520:a920f2ca8f5f | 6522:20c9a023b6c1 |
|---|---|
| 3285 if key == "MailServerPassword": | 3285 if key == "MailServerPassword": |
| 3286 from Utilities.crypto import pwConvert | 3286 from Utilities.crypto import pwConvert |
| 3287 return pwConvert(prefClass.settings.value( | 3287 return pwConvert(prefClass.settings.value( |
| 3288 "User/" + key, prefClass.userDefaults[key]), encode=False) | 3288 "User/" + key, prefClass.userDefaults[key]), encode=False) |
| 3289 elif key in ["MailServerPort"]: | 3289 elif key in ["MailServerPort"]: |
| 3290 return int(prefClass.settings.value( | 3290 try: |
| 3291 "User/" + key, prefClass.userDefaults[key])) | 3291 return int(prefClass.settings.value( |
| 3292 "User/" + key, prefClass.userDefaults[key])) | |
| 3293 except ValueError: | |
| 3294 return prefClass.userDefaults[key] | |
| 3292 elif key in ["MailServerAuthentication", "UseSystemEmailClient", | 3295 elif key in ["MailServerAuthentication", "UseSystemEmailClient", |
| 3293 "UseMasterPassword", "SavePasswords", "UseGoogleMailOAuth2"]: | 3296 "UseMasterPassword", "SavePasswords", "UseGoogleMailOAuth2"]: |
| 3294 return toBool(prefClass.settings.value( | 3297 return toBool(prefClass.settings.value( |
| 3295 "User/" + key, prefClass.userDefaults[key])) | 3298 "User/" + key, prefClass.userDefaults[key])) |
| 3296 elif key == "MailServerEncryption": | 3299 elif key == "MailServerEncryption": |
