diff --git a/letsencrypt/client/apache/configurator.py b/letsencrypt/client/apache/configurator.py index 12dac92a3..8b32cf7a7 100644 --- a/letsencrypt/client/apache/configurator.py +++ b/letsencrypt/client/apache/configurator.py @@ -60,7 +60,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): .. todo:: Add proper support for module configuration The API of this class will change in the coming weeks as the exact - needs of client's are clarified with the new and developing protocol. + needs of clients are clarified with the new and developing protocol. :ivar str server_root: Path to Apache root directory :ivar dict location: Path to various files associated @@ -230,7 +230,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): # No matches, search for the default for vhost in self.vhosts: - if "_defualt_:443" in vhost.addrs: + if "_default_:443" in vhost.addrs: return vhost return None @@ -762,7 +762,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): return vhost return None - # TODO: Handle ths as outlined in Interfaces. + # TODO: Handle this as outlined in Interfaces. def enable_ocsp_stapling(self, ssl_vhost): """Enable OCSP Stapling.""" return False @@ -772,7 +772,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): return False def get_all_certs_keys(self): - """ Find all existing keys, certs from configuration. + """Find all existing keys, certs from configuration. Retrieve all certs and keys set in VirtualHosts on the Apache server @@ -945,7 +945,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): return None def dvsni_perform(self, chall_dict): - """Peform a DVSNI challenge. + """Perform a DVSNI challenge. `chall_dict` composed of: diff --git a/letsencrypt/client/apache/parser.py b/letsencrypt/client/apache/parser.py index f2516a49e..d902bfe19 100644 --- a/letsencrypt/client/apache/parser.py +++ b/letsencrypt/client/apache/parser.py @@ -98,7 +98,7 @@ class ApacheParser(object): :param str directive: Directive to look for - :param arg: Specific value direcitve must have, None if all should + :param arg: Specific value directive must have, None if all should be considered :type arg: str or None diff --git a/letsencrypt/client/crypto_util.py b/letsencrypt/client/crypto_util.py index 04a8ac373..c11719343 100644 --- a/letsencrypt/client/crypto_util.py +++ b/letsencrypt/client/crypto_util.py @@ -28,10 +28,10 @@ def create_sig(msg, key_str, nonce=None, nonce_len=CONFIG.NONCE_SIZE): :param str msg: Message to be signed :param nonce: Nonce to be used. If None, nonce of `nonce_len` size - will be randomly genereted. + will be randomly generated. :type nonce: str or None - :param int nonce_len: Size of the automaticaly generated nonce. + :param int nonce_len: Size of the automatically generated nonce. :returns: Signature. :rtype: dict diff --git a/letsencrypt/client/le_util.py b/letsencrypt/client/le_util.py index 42f88bc5d..d96dc8c09 100644 --- a/letsencrypt/client/le_util.py +++ b/letsencrypt/client/le_util.py @@ -10,8 +10,8 @@ from letsencrypt.client import errors def make_or_verify_dir(directory, mode=0o755, uid=0): """Make sure directory exists with proper permissions. - :param str directory: Path to a directry. - :param int mode: Diretory mode. + :param str directory: Path to a directory. + :param int mode: Directory mode. :param int uid: Directory owner. :raises LetsEncryptClientError: if a directory already exists, @@ -28,7 +28,7 @@ def make_or_verify_dir(directory, mode=0o755, uid=0): if exception.errno == errno.EEXIST: if not check_permissions(directory, mode, uid): raise errors.LetsEncryptClientError( - '%s exists and does not contain the proper ' + '%s exists, but does not have the proper ' 'permissions or owner' % directory) else: raise @@ -107,7 +107,7 @@ def jose_b64decode(data): :returns: Decoded data. :raises TypeError: if input is of incorrect type - :raises ValueError: if unput is unicode with non-ASCII characters + :raises ValueError: if input is unicode with non-ASCII characters """ if isinstance(data, unicode): diff --git a/letsencrypt/client/network.py b/letsencrypt/client/network.py index 855008b6b..b1548b687 100644 --- a/letsencrypt/client/network.py +++ b/letsencrypt/client/network.py @@ -80,14 +80,14 @@ class Network(object): 'Expected message (%s) not received' % expected) def is_expected_msg(self, response, expected, delay=3, rounds=20): - """Is reponse expected ACME message? + """Is response expected ACME message? :param dict response: ACME response message from server. :param str expected: Name of the expected response ACME message type. :param int delay: Number of seconds to delay before next round in case of ACME "defer" response message. :param int rounds: Number of resend attempts in case of ACME "defer" - reponse message. + response message. :returns: ACME response message from server. :rtype: dict diff --git a/letsencrypt/client/recovery_contact_challenge.py b/letsencrypt/client/recovery_contact_challenge.py index d5cd5f889..6bafed829 100644 --- a/letsencrypt/client/recovery_contact_challenge.py +++ b/letsencrypt/client/recovery_contact_challenge.py @@ -14,7 +14,7 @@ from letsencrypt.client import interfaces class RecoveryContact(object): - """Recovery Contact Identitifier Validation Challenge. + """Recovery Contact Identifier Validation Challenge. Based on draft-barnes-acme, section 6.3.