summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-08-08 23:54:49 +0200
committerdrebs <drebs@leap.se>2013-08-08 23:54:49 +0200
commit409691a0e68f08cb66c0ef829e37b80882dea964 (patch)
tree64fc9bf3dba8d321f4c647ee1e3fac3b1e781f62 /src
parent14fbcb055fcc2084e11497c53deb1b523ed85f32 (diff)
parentdcef4e423ca044c5c008e77b463080f3d0fc3bf5 (diff)
Merge branch 'bug/check_str_or_unicode' into develop
Diffstat (limited to 'src')
-rw-r--r--src/leap/mail/smtp/smtprelay.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/leap/mail/smtp/smtprelay.py b/src/leap/mail/smtp/smtprelay.py
index 5211d8e..5f73be7 100644
--- a/src/leap/mail/smtp/smtprelay.py
+++ b/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