diff options
| -rw-r--r-- | mail/src/leap/mail/__init__.py | 7 | ||||
| -rw-r--r-- | mail/src/leap/mail/smtp/smtprelay.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mail/src/leap/mail/__init__.py b/mail/src/leap/mail/__init__.py index 04a9951..5f4810c 100644 --- a/mail/src/leap/mail/__init__.py +++ b/mail/src/leap/mail/__init__.py @@ -21,8 +21,9 @@ Provide function for loading tests. """ -import unittest +# Do not force the unittest dependency +# import unittest -def load_tests(): - return unittest.defaultTestLoader.discover('./src/leap/mail') +# def load_tests(): +# return unittest.defaultTestLoader.discover('./src/leap/mail') diff --git a/mail/src/leap/mail/smtp/smtprelay.py b/mail/src/leap/mail/smtp/smtprelay.py index 5211d8e..5f73be7 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 |