diff options
| author | drebs <drebs@leap.se> | 2013-08-13 22:55:46 -0300 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-08-13 22:56:56 -0300 |
| commit | f26d4c395f56ae07d7341fd48f8e5b244db8328c (patch) | |
| tree | 395ae01d399fc89df24b9889bf6f3c2f77cb76bf | |
| parent | 518b79bd19fc00b6509b6cb7868a385497deb494 (diff) | |
Fix docstrings and comments.
| -rw-r--r-- | src/leap/mail/smtp/smtprelay.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/leap/mail/smtp/smtprelay.py b/src/leap/mail/smtp/smtprelay.py index 5f73be7..0c29029 100644 --- a/src/leap/mail/smtp/smtprelay.py +++ b/src/leap/mail/smtp/smtprelay.py @@ -67,8 +67,8 @@ def assert_config_structure(config): { HOST_KEY: '<str>', PORT_KEY: <int>, - USERNAME_KEY: '<str>', - PASSWORD_KEY: '<str>', + CERT_KEY: '<str>', + KEY_KEY: '<str>', ENCRYPTED_ONLY_KEY: <bool>, } @@ -107,8 +107,8 @@ def validate_address(address): @raise smtp.SMTPBadRcpt: Raised if C{address} is invalid. """ leap_assert_type(address, str) - # the following parses the address as described in RFC 2822 and - # returns ('', '') if the parse fails. + # in the following, the address is parsed as described in RFC 2822 and + # ('', '') is returned if the parse fails. _, address = parseaddr(address) if address == '': raise smtp.SMTPBadRcpt(address) @@ -186,8 +186,8 @@ class SMTPDelivery(object): { HOST_KEY: '<str>', PORT_KEY: <int>, - USERNAME_KEY: '<str>', - PASSWORD_KEY: '<str>', + CERT_KEY: '<str>', + KEY_KEY: '<str>', ENCRYPTED_ONLY_KEY: <bool>, } @type config: dict @@ -321,8 +321,8 @@ class EncryptedMessage(object): { HOST_KEY: '<str>', PORT_KEY: <int>, - USERNAME_KEY: '<str>', - PASSWORD_KEY: '<str>', + CERT_KEY: '<str>', + KEY_KEY: '<str>', ENCRYPTED_ONLY_KEY: <bool>, } @type config: dict @@ -416,8 +416,8 @@ class EncryptedMessage(object): d = defer.Deferred() factory = smtp.ESMTPSenderFactory( - "", - "", + "", # username is blank because server does not use auth. + "", # password is blank because server does not use auth. self._fromAddress.addrstr, self._user.dest.addrstr, StringIO(msg), |