diff --git a/acme/acme/challenges.py b/acme/acme/challenges.py index 9f9cc05b8..3bfc1e62f 100644 --- a/acme/acme/challenges.py +++ b/acme/acme/challenges.py @@ -183,7 +183,7 @@ class KeyAuthorizationChallenge(_TokenChallenge): Subclasses must implement this method, but they are likely to return completely different data structures, depending on what's - necessary to complete the challenge. Interepretation of that + necessary to complete the challenge. Interpretation of that return value must be known to the caller. :param JWK account_key: diff --git a/acme/acme/client_test.py b/acme/acme/client_test.py index e88baa340..d67c425bd 100644 --- a/acme/acme/client_test.py +++ b/acme/acme/client_test.py @@ -170,7 +170,7 @@ class ClientTest(unittest.TestCase): self.directory.new_authz, messages.NewAuthorization(identifier=self.identifier)) - def test_requets_challenges_custom_uri(self): + def test_request_challenges_custom_uri(self): self._prepare_response_for_request_challenges() self.client.request_challenges(self.identifier, 'URI') self.net.post.assert_called_once_with('URI', mock.ANY) @@ -388,7 +388,7 @@ class ClientTest(unittest.TestCase): errors.PollError, self.client.poll_and_request_issuance, csr, authzrs=(invalid_authzr,), mintime=mintime) - # exceeded max_attemps | TODO: move to a separate test + # exceeded max_attempts | TODO: move to a separate test self.assertRaises( errors.PollError, self.client.poll_and_request_issuance, csr, authzrs, mintime=mintime, max_attempts=2) diff --git a/acme/acme/crypto_util_test.py b/acme/acme/crypto_util_test.py index bd93ae0e1..ebb4010a6 100644 --- a/acme/acme/crypto_util_test.py +++ b/acme/acme/crypto_util_test.py @@ -59,7 +59,7 @@ class SSLSocketAndProbeSNITest(unittest.TestCase): def test_probe_not_recognized_name(self): self.assertRaises(errors.Error, self._probe, b'bar') - # TODO: py33/py34 tox hangs forever on do_hendshake in second probe + # TODO: py33/py34 tox hangs forever on do_handshake in second probe #def probe_connection_error(self): # self._probe(b'foo') # #time.sleep(1) # TODO: avoid race conditions in other way diff --git a/acme/acme/jose/__init__.py b/acme/acme/jose/__init__.py index f39c3beab..9116bc433 100644 --- a/acme/acme/jose/__init__.py +++ b/acme/acme/jose/__init__.py @@ -1,6 +1,6 @@ """Javascript Object Signing and Encryption (jose). -This package is a Python implementation of the stadards developed by +This package is a Python implementation of the standards developed by IETF `Javascript Object Signing and Encryption (Active WG)`_, in particular the following RFCs: diff --git a/acme/acme/jose/json_util.py b/acme/acme/jose/json_util.py index cc66d77ff..d474f4aac 100644 --- a/acme/acme/jose/json_util.py +++ b/acme/acme/jose/json_util.py @@ -60,7 +60,7 @@ class Field(object): @classmethod def _empty(cls, value): - """Is the provided value cosidered "empty" for this field? + """Is the provided value considered "empty" for this field? This is useful for subclasses that might want to override the definition of being empty, e.g. for some more exotic data types. diff --git a/acme/acme/jose/jwk.py b/acme/acme/jose/jwk.py index 4d07229b3..5b6965c4d 100644 --- a/acme/acme/jose/jwk.py +++ b/acme/acme/jose/jwk.py @@ -111,7 +111,7 @@ class JWK(json_util.TypedJSONObjectWithFields): try: key = cls._load_cryptography_key(data, password, backend) except errors.Error as error: - logger.debug('Loading symmetric key, assymentric failed: %s', error) + logger.debug('Loading symmetric key, asymmetric failed: %s', error) return JWKOct(key=data) if cls.typ is not NotImplemented and not isinstance( diff --git a/acme/acme/messages_test.py b/acme/acme/messages_test.py index a0322968c..b3454f25b 100644 --- a/acme/acme/messages_test.py +++ b/acme/acme/messages_test.py @@ -26,7 +26,7 @@ class ErrorTest(unittest.TestCase): 'type': ERROR_PREFIX + 'malformed', } self.error_custom = Error(typ='custom', detail='bar') - self.jobj_cusom = {'type': 'custom', 'detail': 'bar'} + self.jobj_custom = {'type': 'custom', 'detail': 'bar'} def test_default_typ(self): from acme.messages import Error diff --git a/certbot-apache/certbot_apache/obj.py b/certbot-apache/certbot_apache/obj.py index c71443e92..b29b0e0ee 100644 --- a/certbot-apache/certbot_apache/obj.py +++ b/certbot-apache/certbot_apache/obj.py @@ -8,7 +8,7 @@ class Addr(common.Addr): """Represents an Apache address.""" def __eq__(self, other): - """This is defined as equalivalent within Apache. + """This is defined as equivalent within Apache. ip_addr:* == ip_addr diff --git a/certbot-apache/certbot_apache/tests/apache-conf-files/passing/comment-continuations-2050.conf b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/comment-continuations-2050.conf index 48b344d8a..4c3fa2af1 100644 --- a/certbot-apache/certbot_apache/tests/apache-conf-files/passing/comment-continuations-2050.conf +++ b/certbot-apache/certbot_apache/tests/apache-conf-files/passing/comment-continuations-2050.conf @@ -263,7 +263,7 @@ # # Set the following policy settings here and they will be propagated to the 30 rules # file (modsecurity_crs_30_http_policy.conf) by using macro expansion. -# If you run into false positves, you can adjust the settings here. +# If you run into false positives, you can adjust the settings here. # #SecAction \ "id:'900012', \ @@ -349,7 +349,7 @@ # -# -- [[ Check UTF enconding ]] ----------------------------------------------------------- +# -- [[ Check UTF encoding ]] ----------------------------------------------------------- # # We only want to apply this check if UTF-8 encoding is actually used by the site, otherwise # it will result in false positives. diff --git a/certbot-apache/certbot_apache/tests/parser_test.py b/certbot-apache/certbot_apache/tests/parser_test.py index 759ae1265..513f16c4e 100644 --- a/certbot-apache/certbot_apache/tests/parser_test.py +++ b/certbot-apache/certbot_apache/tests/parser_test.py @@ -178,7 +178,7 @@ class ParserInitTest(util.ApacheTest): shutil.rmtree(self.work_dir) @mock.patch("certbot_apache.parser.ApacheParser._get_runtime_cfg") - def test_unparsable(self, mock_cfg): + def test_unparseable(self, mock_cfg): from certbot_apache.parser import ApacheParser mock_cfg.return_value = ('Define: TEST') self.assertRaises( diff --git a/certbot-apache/certbot_apache/tls_sni_01.py b/certbot-apache/certbot_apache/tls_sni_01.py index 18179d080..d9e294119 100644 --- a/certbot-apache/certbot_apache/tls_sni_01.py +++ b/certbot-apache/certbot_apache/tls_sni_01.py @@ -177,7 +177,7 @@ class ApacheTlsSni01(common.TLSSNI01): ips = " ".join(str(i) for i in ip_addrs) document_root = os.path.join( self.configurator.config.work_dir, "tls_sni_01_page/") - # TODO: Python docs is not clear how mutliline string literal + # TODO: Python docs is not clear how multiline string literal # newlines are parsed on different platforms. At least on # Linux (Debian sid), when source file uses CRLF, Python still # parses it as "\n"... c.f.: diff --git a/certbot-compatibility-test/certbot_compatibility_test/test_driver.py b/certbot-compatibility-test/certbot_compatibility_test/test_driver.py index b5e023f36..71100bb27 100644 --- a/certbot-compatibility-test/certbot_compatibility_test/test_driver.py +++ b/certbot-compatibility-test/certbot_compatibility_test/test_driver.py @@ -147,7 +147,7 @@ def test_deploy_cert(plugin, temp_dir, domains): plugin.deploy_cert(domain, cert_path, util.KEY_PATH, cert_path, cert_path) plugin.save() # Needed by the Apache plugin except le_errors.Error as error: - logger.error("Plugin failed to deploy ceritificate for %s:", domain) + logger.error("Plugin failed to deploy certificate for %s:", domain) logger.exception(error) return False @@ -202,7 +202,7 @@ def test_enhancements(plugin, domains): success = False if success: - logger.info("Enhancments test succeeded") + logger.info("Enhancements test succeeded") return success diff --git a/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/chive/chive-nginx-master/nginx.conf b/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/chive/chive-nginx-master/nginx.conf index 22ad4c317..bc708783f 100644 --- a/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/chive/chive-nginx-master/nginx.conf +++ b/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/chive/chive-nginx-master/nginx.conf @@ -38,7 +38,7 @@ http { ## Define a zone for limiting the number of simultaneous ## connections nginx accepts. 1m means 32000 simultaneous ## sessions. We need to define for each server the limit_conn - ## value refering to this or other zones. + ## value referring to this or other zones. ## ** This syntax requires nginx version >= ## ** 1.1.8. Cf. http://nginx.org/en/CHANGES. If using an older ## ** version then use the limit_zone directive below diff --git a/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/chive/chive-nginx-master/win-utf b/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/chive/chive-nginx-master/win-utf index ed8bc007a..d0b7116c8 100644 --- a/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/chive/chive-nginx-master/win-utf +++ b/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/chive/chive-nginx-master/win-utf @@ -37,7 +37,7 @@ charset_map windows-1251 utf-8 { AA D084 ; # capital Ukrainian YE AB C2AB ; # left-pointing double angle quotation mark AC C2AC ; # not sign - AD C2AD ; # soft hypen + AD C2AD ; # soft hyphen AE C2AE ; # (R) AF D087 ; # capital Ukrainian YI diff --git a/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/guide-to-nginx-ssl-spdy-hsts/nginx.conf b/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/guide-to-nginx-ssl-spdy-hsts/nginx.conf index f195b4d21..55e2dab0d 100644 --- a/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/guide-to-nginx-ssl-spdy-hsts/nginx.conf +++ b/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/guide-to-nginx-ssl-spdy-hsts/nginx.conf @@ -8,7 +8,7 @@ http { keepalive_timeout 60; # http-redirects to https; even if using of hsts; - # usefull if users are typing your server-name w/out https:// + # useful if users are typing your server-name w/out https:// # logjam and a good idea anyway @@ -98,7 +98,7 @@ http { #ssl_ciphers ALL:!ADH:!EXP:!LOW:!RC2:!3DES:!SEED:!RC4:+HIGH:+MEDIUM; # - # suggestions by mozilla-server-team - good compatibility, pfs, preferrable ciphers + # suggestions by mozilla-server-team - good compatibility, pfs, preferable ciphers # # modern ciphers ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK'; @@ -106,7 +106,7 @@ http { # intermediate ciphers #ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA'; - # old ciphers (would need SSLv3, but is not recommende as of oct 2014 + # old ciphers (would need SSLv3, but is not recommended as of oct 2014 #ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-RSA-DES-CBC3-SHA:ECDHE-ECDSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA'; # logjam / cipher suggested from weakdh.org diff --git a/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/phplist/nginx.conf b/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/phplist/nginx.conf index 9cf532809..357100558 100644 --- a/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/phplist/nginx.conf +++ b/certbot-compatibility-test/nginx/nginx-roundtrip-testdata/phplist/nginx.conf @@ -29,7 +29,7 @@ server { location ~* (index\.php|upload\.php|connector\.php|dl\.php|ut\.php|lt\.php|download\.php)$ { fastcgi_split_path_info ^(.|\.php)(/.+)$; - include /etc/nginx/fastcgi_params.conf; #standar fastcgi config file + include /etc/nginx/fastcgi_params.conf; #standard fastcgi config file fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_intercept_errors on; fastcgi_pass 127.0.0.1:9000; diff --git a/certbot-nginx/certbot_nginx/nginxparser.py b/certbot-nginx/certbot_nginx/nginxparser.py index 2cbd0b86a..f6437c589 100644 --- a/certbot-nginx/certbot_nginx/nginxparser.py +++ b/certbot-nginx/certbot_nginx/nginxparser.py @@ -52,10 +52,10 @@ class RawNginxParser(object): map_statement = space + Literal("map") + space + nonspace + space + dollar_var + space # This is NOT an accurate way to parse nginx map entries; it's almost - # certianly too permissive and may be wrong in other ways, but it should + # certainly too permissive and may be wrong in other ways, but it should # preserve things correctly in mmmmost or all cases. # - # - I can neither prove nor disprove that it is corect wrt all escaped + # - I can neither prove nor disprove that it is correct wrt all escaped # semicolon situations # Addresses https://github.com/fatiherikli/nginxparser/issues/19 map_pattern = Regex(r'".*"') | Regex(r"'.*'") | nonspace @@ -143,7 +143,7 @@ class RawNginxDumper(object): def loads(source): """Parses from a string. - :param str souce: The string to parse + :param str source: The string to parse :returns: The parsed tree :rtype: list diff --git a/certbot-nginx/certbot_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules b/certbot-nginx/certbot_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules index c9220209f..9826e02cb 100644 --- a/certbot-nginx/certbot_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules +++ b/certbot-nginx/certbot_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/naxsi_core.rules @@ -67,7 +67,7 @@ MainRule "rx:%[2|3]." "msg:double encoding !" "mz:ARGS|URL|BODY|$HEADERS_VAR:Co #################################### MainRule "str:&#" "msg: utf7/8 encoding" "mz:ARGS|BODY|URL|$HEADERS_VAR:Cookie" "s:$EVADE:4" id:1400; MainRule "str:%U" "msg: M$ encoding" "mz:ARGS|BODY|URL|$HEADERS_VAR:Cookie" "s:$EVADE:4" id:1401; -MainRule negative "rx:multipart/form-data|application/x-www-form-urlencoded" "msg:Content is neither mulipart/x-www-form.." "mz:$HEADERS_VAR:Content-type" "s:$EVADE:4" id:1402; +MainRule negative "rx:multipart/form-data|application/x-www-form-urlencoded" "msg:Content is neither multipart/x-www-form.." "mz:$HEADERS_VAR:Content-type" "s:$EVADE:4" id:1402; ############################# ## File uploads: 1500-1600 ## diff --git a/certbot-nginx/certbot_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf b/certbot-nginx/certbot_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf index 774fd9fc9..cd2885292 100644 --- a/certbot-nginx/certbot_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf +++ b/certbot-nginx/certbot_nginx/tests/testdata/etc_nginx/ubuntu_nginx_1_4_6/default_vhost/nginx/win-utf @@ -36,7 +36,7 @@ charset_map windows-1251 utf-8 { AA D084; # capital Ukrainian YE AB C2AB; # left-pointing double angle quotation mark AC C2AC; # not sign - AD C2AD; # soft hypen + AD C2AD; # soft hyphen AE C2AE; # (R) AF D087; # capital Ukrainian YI diff --git a/certbot/achallenges.py b/certbot/achallenges.py index 5ee6d2945..c2af45fdb 100644 --- a/certbot/achallenges.py +++ b/certbot/achallenges.py @@ -1,6 +1,6 @@ """Client annotated ACME challenges. -Please use names such as ``achall`` to distiguish from variables "of type" +Please use names such as ``achall`` to distinguish from variables "of type" :class:`acme.challenges.Challenge` (denoted by ``chall``) and :class:`.ChallengeBody` (denoted by ``challb``):: diff --git a/certbot/cli.py b/certbot/cli.py index 88d6d39db..f3b07d925 100644 --- a/certbot/cli.py +++ b/certbot/cli.py @@ -150,7 +150,7 @@ def possible_deprecation_warning(config): if cli_command != LEAUTO: return if config.no_self_upgrade: - # users setting --no-self-upgrade might be hanging on a clent version like 0.3.0 + # users setting --no-self-upgrade might be hanging on a client version like 0.3.0 # or 0.5.0 which is the new script, but doesn't set CERTBOT_AUTO; they don't # need warnings return @@ -318,7 +318,7 @@ class CustomHelpFormatter(argparse.HelpFormatter): # The attributes here are: # short: a string that will be displayed by "certbot -h commands" # opts: a string that heads the section of flags with which this command is documented, -# both for "cerbot -h SUBCOMMAND" and "certbot -h all" +# both for "certbot -h SUBCOMMAND" and "certbot -h all" # usage: an optional string that overrides the header of "certbot -h SUBCOMMAND" VERB_HELP = [ ("run (default)", { @@ -334,7 +334,7 @@ VERB_HELP = [ "This command obtains a TLS/SSL certificate without installing it anywhere.") }), ("renew", { - "short": "Renew all certificates (or one specifed with --cert-name)", + "short": "Renew all certificates (or one specified with --cert-name)", "opts": ("The 'renew' subcommand will attempt to renew all" " certificates (or more precisely, certificate lineages) you have" " previously obtained if they are close to expiry, and print a" @@ -496,7 +496,7 @@ class HelpfulArgumentParser(object): if "apache" in plugins: apache_doc = "--apache Use the Apache plugin for authentication & installation" else: - apache_doc = "(the cerbot apache plugin is not installed)" + apache_doc = "(the certbot apache plugin is not installed)" usage = SHORT_USAGE if help_arg == True: diff --git a/certbot/client.py b/certbot/client.py index f76688b70..8d53a29d3 100644 --- a/certbot/client.py +++ b/certbot/client.py @@ -93,7 +93,7 @@ def register(config, account_storage, tos_cb=None): Terms of Service present in the contained `.Registration.terms_of_service` is accepted by the client, and ``False`` otherwise. ``tos_cb`` will be called only if the - client acction is necessary, i.e. when ``terms_of_service is not + client action is necessary, i.e. when ``terms_of_service is not None``. This argument is optional, if not supplied it will default to automatic acceptance! @@ -438,7 +438,7 @@ class Client(object): self.installer.restart() def apply_enhancement(self, domains, enhancement, options=None): - """Applies an enhacement on all domains. + """Applies an enhancement on all domains. :param domains: list of ssl_vhosts :type list of str @@ -494,7 +494,7 @@ class Client(object): self.installer.rollback_checkpoints() self.installer.restart() except: - # TODO: suggest letshelp-letsencypt here + # TODO: suggest letshelp-letsencrypt here reporter.add_message( "An error occurred and we failed to restore your config and " "restart your server. Please submit a bug report to " diff --git a/certbot/main.py b/certbot/main.py index f8cb411b5..b52e605be 100644 --- a/certbot/main.py +++ b/certbot/main.py @@ -812,7 +812,7 @@ def make_or_verify_core_dir(directory, mode, uid, strict): raise errors.Error(_PERM_ERR_FMT.format(error)) def make_or_verify_needed_dirs(config): - """Create or verify existance of config, work, or logs directories""" + """Create or verify existence of config, work, or logs directories""" make_or_verify_core_dir(config.config_dir, constants.CONFIG_DIRS_MODE, os.geteuid(), config.strict_permissions) make_or_verify_core_dir(config.work_dir, constants.CONFIG_DIRS_MODE, diff --git a/certbot/plugins/disco.py b/certbot/plugins/disco.py index ba532eb1b..e567422e2 100644 --- a/certbot/plugins/disco.py +++ b/certbot/plugins/disco.py @@ -79,7 +79,7 @@ class PluginEntryPoint(object): return self._initialized is not None def init(self, config=None): - """Memoized plugin inititialization.""" + """Memoized plugin initialization.""" if not self.initialized: self.entry_point.require() # fetch extras! self._initialized = self.plugin_cls(config, self.name) @@ -230,7 +230,7 @@ class PluginsRegistry(collections.Mapping): def available(self): """Filter plugins based on availability.""" return self.filter(lambda p_ep: p_ep.available) - # succefully prepared + misconfigured + # successfully prepared + misconfigured def find_init(self, plugin): """Find an initialized plugin. diff --git a/certbot/plugins/disco_test.py b/certbot/plugins/disco_test.py index 7282c9ec8..6c3c39dca 100644 --- a/certbot/plugins/disco_test.py +++ b/certbot/plugins/disco_test.py @@ -255,7 +255,7 @@ class PluginsRegistryTest(unittest.TestCase): def test_find_init(self): self.assertTrue(self.reg.find_init(mock.Mock()) is None) - self.plugin_ep.initalized = True + self.plugin_ep.initialized = True self.assertTrue( self.reg.find_init(self.plugin_ep.init()) is self.plugin_ep) diff --git a/certbot/plugins/selection_test.py b/certbot/plugins/selection_test.py index eb4db2081..41c2b55c9 100644 --- a/certbot/plugins/selection_test.py +++ b/certbot/plugins/selection_test.py @@ -1,4 +1,4 @@ -"""Tests for letsenecrypt.plugins.selection""" +"""Tests for letsencrypt.plugins.selection""" import sys import unittest diff --git a/certbot/storage.py b/certbot/storage.py index af0e9d701..4f1cd0a9d 100644 --- a/certbot/storage.py +++ b/certbot/storage.py @@ -716,7 +716,7 @@ class RenewableCert(object): :returns: ``True`` if there is a complete version of this lineage with a larger version number than the current - version, and ``False`` otherwis + version, and ``False`` otherwise :rtype: bool """ diff --git a/certbot/tests/cli_test.py b/certbot/tests/cli_test.py index aff1bcc99..d157901e4 100644 --- a/certbot/tests/cli_test.py +++ b/certbot/tests/cli_test.py @@ -52,7 +52,7 @@ class ParseTest(unittest.TestCase): return cli.prepare_and_parse_args(PLUGINS, *args, **kwargs) def _help_output(self, args): - "Run a command, and return the ouput string for scrutiny" + "Run a command, and return the output string for scrutiny" output = six.StringIO() with mock.patch('certbot.main.sys.stdout', new=output): diff --git a/certbot/tests/error_handler_test.py b/certbot/tests/error_handler_test.py index a548377bd..60dcf5e99 100644 --- a/certbot/tests/error_handler_test.py +++ b/certbot/tests/error_handler_test.py @@ -70,7 +70,7 @@ class ErrorHandlerTest(unittest.TestCase): send_signal(self.signals[0]) should_be_42 *= 10 - # check exectuion stoped when the signal was sent + # check execution stoped when the signal was sent self.assertEqual(42, should_be_42) # assert signals were caught self.assertEqual([self.signals[0]], signals_received) diff --git a/certbot/tests/errors_test.py b/certbot/tests/errors_test.py index f35a5ea08..aee1857a6 100644 --- a/certbot/tests/errors_test.py +++ b/certbot/tests/errors_test.py @@ -9,7 +9,7 @@ from certbot import achallenges from certbot.tests import acme_util -class FaiiledChallengesTest(unittest.TestCase): +class FailedChallengesTest(unittest.TestCase): """Tests for certbot.errors.FailedChallenges.""" def setUp(self): diff --git a/certbot/tests/reverter_test.py b/certbot/tests/reverter_test.py index 2eeabe116..d430f8292 100644 --- a/certbot/tests/reverter_test.py +++ b/certbot/tests/reverter_test.py @@ -394,7 +394,7 @@ class TestFullCheckpointsReverter(unittest.TestCase): self.assertTrue(mock_logger.info.call_count > 0) def test_view_config_changes_bad_backups_dir(self): - # There shouldn't be any "in progess directories when this is called + # There shouldn't be any "in progress directories when this is called # It must just be clean checkpoints os.makedirs(os.path.join(self.config.backup_dir, "in_progress")) diff --git a/docs/ciphers.rst b/docs/ciphers.rst index cf9ffdb99..31ce45963 100644 --- a/docs/ciphers.rst +++ b/docs/ciphers.rst @@ -206,7 +206,7 @@ or a family of enhancements, one per selectable ciphersuite configuration. Feedback ======== -We receive lots of feedback on the type of ciphersuites that Let's Encrypt supports and list some coallated feedback below. This section aims to track suggestions and references that people have offered or identified to improve the ciphersuites that Let's Encrypt enables when configuring TLS on servers. +We receive lots of feedback on the type of ciphersuites that Let's Encrypt supports and list some collated feedback below. This section aims to track suggestions and references that people have offered or identified to improve the ciphersuites that Let's Encrypt enables when configuring TLS on servers. Because of the Chatham House Rule applicable to some of the discussions, people are *not* individually credited for their suggestions, but most suggestions here were made or found by other people, and I thank them for their contributions. diff --git a/docs/cli-help.txt b/docs/cli-help.txt index 349092630..9e1dbc268 100644 --- a/docs/cli-help.txt +++ b/docs/cli-help.txt @@ -210,7 +210,7 @@ manage: certificates List certificates managed by Certbot delete Clean up all files related to a certificate - renew Renew all certificates (or one specifed with --cert- + renew Renew all certificates (or one specified with --cert- name) revoke Revoke a certificate specified with --cert-path update_symlinks Recreate symlinks in your /etc/letsencrypt/live/ diff --git a/docs/contributing.rst b/docs/contributing.rst index c51e493bc..040c22864 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -336,7 +336,7 @@ the ``letsencrypt-auto-source`` and Building letsencrypt-auto-source/letsencrypt-auto ------------------------------------------------- Once changes to any of the aforementioned files have been made, the -``letesncrypt-auto-source/letsencrypt-auto`` script should be updated. In lieu of +``letsencrypt-auto-source/letsencrypt-auto`` script should be updated. In lieu of manually updating this script, run the build script, which lives at ``letsencrypt-auto-source/build.py``: diff --git a/docs/using.rst b/docs/using.rst index a1881852e..0d74e4f8b 100644 --- a/docs/using.rst +++ b/docs/using.rst @@ -30,7 +30,7 @@ control the domain(s) you are requesting a cert for, obtains a cert for the spec domain(s), and places the cert in the ``/etc/letsencrypt`` directory on your machine. The authenticator does not install the cert (it does not edit any of your server's configuration files to serve the obtained certificate). If you specify multiple domains to authenticate, they will -all be listed in a single certificate. To obtain multiple seperate certificates +all be listed in a single certificate. To obtain multiple separate certificates you will need to run Certbot multiple times. Installers are Plugins used with the ``install`` command to install a cert. @@ -62,7 +62,7 @@ manual_ Y N | Helps you obtain a cert by giving you instructions to pe Under the hood, plugins use one of several ACME protocol "Challenges_" to prove you control a domain. The options are http-01_ (which uses port 80), -tls-sni-01_ (port 443) and dns-01_ (requring configuration of a DNS server on +tls-sni-01_ (port 443) and dns-01_ (requiring configuration of a DNS server on port 53, though that's often not the same machine as your webserver). A few plugins support more than one challenge type, in which case you can choose one with ``--preferred-challenges``. @@ -433,7 +433,7 @@ variables to these scripts: - ``CERTBOT_DOMAIN``: The domain being authenticated - ``CERTBOT_VALIDATION``: The validation string -- ``CERTBOT_TOKEN``: Resource name part of the HTTP-01 challenege (HTTP-01 only) +- ``CERTBOT_TOKEN``: Resource name part of the HTTP-01 challenge (HTTP-01 only) Additionally for cleanup: diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto index e5e8a431b..68f135bf8 100755 --- a/letsencrypt-auto-source/letsencrypt-auto +++ b/letsencrypt-auto-source/letsencrypt-auto @@ -105,7 +105,7 @@ fi # certbot itself needs root access for almost all modes of operation # The "normal" case is that sudo is used for the steps that need root, but # this script *can* be run as root (not recommended), or fall back to using -# `su`. Auto-detection can be overrided by explicitly setting the +# `su`. Auto-detection can be overridden by explicitly setting the # environment variable LE_AUTO_SUDO to 'sudo', 'sudo_su' or '' as used below. # Because the parameters in `su -c` has to be a string, @@ -1056,7 +1056,7 @@ UNLIKELY_EOF fi else - # Phase 1: Upgrade certbot-auto if neceesary, then self-invoke. + # Phase 1: Upgrade certbot-auto if necessary, then self-invoke. # # Each phase checks the version of only the thing it is responsible for # upgrading. Phase 1 checks the version of the latest release of diff --git a/letsencrypt-auto-source/letsencrypt-auto.template b/letsencrypt-auto-source/letsencrypt-auto.template index a8a9f04d5..327799210 100755 --- a/letsencrypt-auto-source/letsencrypt-auto.template +++ b/letsencrypt-auto-source/letsencrypt-auto.template @@ -105,7 +105,7 @@ fi # certbot itself needs root access for almost all modes of operation # The "normal" case is that sudo is used for the steps that need root, but # this script *can* be run as root (not recommended), or fall back to using -# `su`. Auto-detection can be overrided by explicitly setting the +# `su`. Auto-detection can be overridden by explicitly setting the # environment variable LE_AUTO_SUDO to 'sudo', 'sudo_su' or '' as used below. # Because the parameters in `su -c` has to be a string, @@ -355,7 +355,7 @@ UNLIKELY_EOF fi else - # Phase 1: Upgrade certbot-auto if neceesary, then self-invoke. + # Phase 1: Upgrade certbot-auto if necessary, then self-invoke. # # Each phase checks the version of only the thing it is responsible for # upgrading. Phase 1 checks the version of the latest release of diff --git a/tests/boulder-integration.sh b/tests/boulder-integration.sh index 5a1f88c8a..4a2131006 100755 --- a/tests/boulder-integration.sh +++ b/tests/boulder-integration.sh @@ -139,7 +139,7 @@ sed -i "4arenew_before_expiry = 4 years" "$root/conf/renewal/le.wtf.conf" common_no_force_renew renew --rsa-key-size 2048 CheckCertCount "le.wtf" 3 -# The 4096 bit setting should persist to the first renewal, but be overriden in the second +# The 4096 bit setting should persist to the first renewal, but be overridden in the second size1=`wc -c ${root}/conf/archive/le.wtf/privkey1.pem | cut -d" " -f1` size2=`wc -c ${root}/conf/archive/le.wtf/privkey2.pem | cut -d" " -f1` diff --git a/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh b/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh index 9b5ff88a2..815522d38 100755 --- a/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh +++ b/tests/letstest/scripts/test_letsencrypt_auto_certonly_standalone.sh @@ -21,7 +21,7 @@ letsencrypt-auto certonly --no-self-upgrade -v --standalone --debug \ # 1. be in the right directory cd tests/letstest/testdata/ -# 2. refer to the config with the same level of relativitity that it itself +# 2. refer to the config with the same level of relativity that it itself # contains :/ OUT=`letsencrypt-auto certificates --config-dir sample-config -v` TEST_CERTS=`echo "$OUT" | grep TEST_CERT | wc -l` diff --git a/tests/letstest/scripts/test_ocsp_experimental.sh b/tests/letstest/scripts/test_ocsp_experimental.sh index cc787653c..91298385c 100755 --- a/tests/letstest/scripts/test_ocsp_experimental.sh +++ b/tests/letstest/scripts/test_ocsp_experimental.sh @@ -22,7 +22,7 @@ sudo venv/bin/certbot certonly --no-self-upgrade -v --standalone --debug \ # 1. be in the right directory cd tests/letstest/testdata/ -# 2. refer to the config with the same level of relativitity that it itself +# 2. refer to the config with the same level of relativity that it itself # contains :/ OUT=`sudo ../../../venv/bin/certbot certificates -v --config-dir sample-config` TEST_CERTS=`echo "$OUT" | grep TEST_CERT | wc -l` diff --git a/tools/_venv_common.sh b/tools/_venv_common.sh index a121af82d..720dcaeab 100755 --- a/tools/_venv_common.sh +++ b/tools/_venv_common.sh @@ -2,7 +2,7 @@ VENV_NAME=${VENV_NAME:-venv} -# .egg-info directories tend to cause bizzaire problems (e.g. `pip -e +# .egg-info directories tend to cause bizarre problems (e.g. `pip -e # .` might unexpectedly install letshelp-certbot only, in case # `python letshelp-certbot/setup.py build` has been called # earlier) diff --git a/tools/release.sh b/tools/release.sh index be306d8e0..75a4af29c 100755 --- a/tools/release.sh +++ b/tools/release.sh @@ -72,7 +72,7 @@ pip install -U virtualenv root_without_le="$version.$$" root="./releases/le.$root_without_le" -echo "Cloning into fresh copy at $root" # clean repo = no artificats +echo "Cloning into fresh copy at $root" # clean repo = no artifacts git clone . $root git rev-parse HEAD cd $root