diff options
| author | drebs <drebs@leap.se> | 2013-08-08 23:54:49 +0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-08-08 23:54:49 +0200 |
| commit | ba18fd17069ac1acf9bf8bd77dde8c46c05f48f8 (patch) | |
| tree | 97569500212f5fd8e3a1ec17cb409f60630a7bfa /mail/src/leap | |
| parent | 09a8dbd33e14950b15f090c0f54e1a33d2a4d826 (diff) | |
| parent | 7fc2243e5d95e775babe1898760e4db4f1ee841a (diff) | |
Merge branch 'bug/check_str_or_unicode' into develop
Diffstat (limited to 'mail/src/leap')
| -rw-r--r-- | mail/src/leap/mail/smtp/smtprelay.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mail/src/leap/mail/smtp/smtprelay.py b/mail/src/leap/mail/smtp/smtprelay.py index 5211d8e8..5f73be7b 100644 --- a/mail/src/leap/mail/smtp/smtprelay.py +++ b/mail/src/leap/mail/smtp/smtprelay.py @@ -82,9 +82,9 @@ def assert_config_structure(config): leap_assert(PORT_KEY in config) leap_assert_type(config[PORT_KEY], int) leap_assert(CERT_KEY in config) - leap_assert_type(config[CERT_KEY], str) + leap_assert_type(config[CERT_KEY], (str, unicode)) leap_assert(KEY_KEY in config) - leap_assert_type(config[KEY_KEY], str) + leap_assert_type(config[KEY_KEY], (str, unicode)) leap_assert(ENCRYPTED_ONLY_KEY in config) leap_assert_type(config[ENCRYPTED_ONLY_KEY], bool) # assert received params are not empty |