diff --git a/lib/ansible/plugins/become/__init__.py b/lib/ansible/plugins/become/__init__.py index c373c1d4ad4..ea5e892a048 100644 --- a/lib/ansible/plugins/become/__init__.py +++ b/lib/ansible/plugins/become/__init__.py @@ -67,7 +67,7 @@ class BecomeBase(AnsiblePlugin): try: cmd = shlex.quote('%s %s %s %s' % (shell.ECHO, self.success, shell.COMMAND_SEP, cmd)) except AttributeError: - # TODO: This should probably become some more robust functionlity used to detect incompat + # TODO: This should probably become some more robust functionality used to detect incompat raise AnsibleError('The %s shell family is incompatible with the %s become plugin' % (shell.SHELL_FAMILY, self.name)) exe = getattr(shell, 'executable', None) if exe and not noexe: diff --git a/lib/ansible/plugins/callback/junit.py b/lib/ansible/plugins/callback/junit.py index c69770e17b1..0f42e303bfc 100644 --- a/lib/ansible/plugins/callback/junit.py +++ b/lib/ansible/plugins/callback/junit.py @@ -75,7 +75,7 @@ DOCUMENTATION = ''' test_case_prefix: name: Prefix to find actual test cases default: - description: Consider a task only as test case if it has this value as prefix. Additionaly failing tasks are recorded as failed test cases. + description: Consider a task only as test case if it has this value as prefix. Additionally failing tasks are recorded as failed test cases. version_added: "2.8" env: - name: JUNIT_TEST_CASE_PREFIX @@ -127,7 +127,7 @@ class CallbackModule(CallbackBase): Default: True JUNIT_HIDE_TASK_ARGUMENTS (optional): Hide the arguments for a task Default: False - JUNIT_TEST_CASE_PREFIX (optional): Consider a task only as test case if it has this value as prefix. Additionaly failing tasks are recorded as failed + JUNIT_TEST_CASE_PREFIX (optional): Consider a task only as test case if it has this value as prefix. Additionally failing tasks are recorded as failed test cases. Default: """ diff --git a/lib/ansible/plugins/callback/tree.py b/lib/ansible/plugins/callback/tree.py index da9c767aa5c..a9f65d26056 100644 --- a/lib/ansible/plugins/callback/tree.py +++ b/lib/ansible/plugins/callback/tree.py @@ -52,7 +52,7 @@ class CallbackModule(CallbackBase): super(CallbackModule, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct) if TREE_DIR: - # TREE_DIR comes from the CLI option --tree, only avialable for adhoc + # TREE_DIR comes from the CLI option --tree, only available for adhoc self.tree = unfrackpath(TREE_DIR) else: self.tree = self.get_option('directory') diff --git a/lib/ansible/plugins/cliconf/__init__.py b/lib/ansible/plugins/cliconf/__init__.py index be2df78daf6..e4dcb1bdc4c 100644 --- a/lib/ansible/plugins/cliconf/__init__.py +++ b/lib/ansible/plugins/cliconf/__init__.py @@ -175,7 +175,7 @@ class CliconfBase(AnsiblePlugin): :param flags: For devices that support configuration filtering, this keyword argument is used to filter the returned configuration. - The use of this keyword argument is device dependent adn will be + The use of this keyword argument is device dependent and will be silently ignored on devices that do not support it. :param format: For devices that support fetching different configuration diff --git a/lib/ansible/plugins/connection/ssh.py b/lib/ansible/plugins/connection/ssh.py index f6fc24c3ddb..1915e0df0b4 100644 --- a/lib/ansible/plugins/connection/ssh.py +++ b/lib/ansible/plugins/connection/ssh.py @@ -301,7 +301,7 @@ DOCUMENTATION = ''' alternatives: ssh_transfer_method default: smart description: - - "Preferred method to use when transfering files over SSH." + - "Preferred method to use when transferring files over SSH." - When set to I(smart), Ansible will try them until one succeeds or they all fail. - If set to I(True), it will force 'scp', if I(False) it will use 'sftp'. - This setting will overridden by ssh_transfer_method if set. @@ -325,7 +325,7 @@ DOCUMENTATION = ''' timeout: default: 10 description: - - This is the default ammount of time we will wait while establishing an SSH connection. + - This is the default amount of time we will wait while establishing an SSH connection. - It also controls how long we can wait to access reading the connection once established (select on the socket). env: - name: ANSIBLE_TIMEOUT diff --git a/lib/ansible/plugins/doc_fragments/action_core.py b/lib/ansible/plugins/doc_fragments/action_core.py index 09544fff12f..9968fef6cda 100644 --- a/lib/ansible/plugins/doc_fragments/action_core.py +++ b/lib/ansible/plugins/doc_fragments/action_core.py @@ -36,7 +36,7 @@ attributes: support: full ''' - # also requries core above + # also requires core above IMPORT = r''' attributes: action: diff --git a/lib/ansible/plugins/filter/core.py b/lib/ansible/plugins/filter/core.py index 745443f27cd..aa6c71eb0ad 100644 --- a/lib/ansible/plugins/filter/core.py +++ b/lib/ansible/plugins/filter/core.py @@ -66,7 +66,7 @@ def to_nice_yaml(a, indent=4, *args, **kw): def to_json(a, *args, **kw): ''' Convert the value to JSON ''' - # defualts for filters + # defaults for filters if 'vault_to_text' not in kw: kw['vault_to_text'] = True if 'preprocess_unsafe' not in kw: diff --git a/lib/ansible/plugins/loader.py b/lib/ansible/plugins/loader.py index ba31c6dff05..c9cba055b93 100644 --- a/lib/ansible/plugins/loader.py +++ b/lib/ansible/plugins/loader.py @@ -1042,10 +1042,10 @@ class Jinja2Loader(PluginLoader): # Instead, calling code deduplicates jinja2 plugin names when loading each file. kwargs['_dedupe'] = False - # TODO: move this to initalization and extract/dedupe plugin names in loader and offset this from + # TODO: move this to initialization and extract/dedupe plugin names in loader and offset this from # caller. It would have to cache/refresh on add_directory to reevaluate plugin list and dedupe. # Another option is to always prepend 'ansible.legac'y and force the collection path to - # load/find plugins, just need to check compatiblity of that approach. + # load/find plugins, just need to check compatibility of that approach. # This would also enable get/find_plugin for these type of plugins. # We have to instantiate a list of all files so that we can reverse the list. diff --git a/lib/ansible/plugins/lookup/__init__.py b/lib/ansible/plugins/lookup/__init__.py index 8a8fd8ed3a2..470f060564f 100644 --- a/lib/ansible/plugins/lookup/__init__.py +++ b/lib/ansible/plugins/lookup/__init__.py @@ -126,5 +126,5 @@ class LookupBase(AnsiblePlugin): def _deprecate_inline_kv(self): # TODO: place holder to deprecate in future version allowing for long transition period - # self._display.deprecated('Passing inline k=v values embeded in a string to this lookup. Use direct ,k=v, k2=v2 syntax instead.', version='2.18') + # self._display.deprecated('Passing inline k=v values embedded in a string to this lookup. Use direct ,k=v, k2=v2 syntax instead.', version='2.18') pass diff --git a/lib/ansible/plugins/netconf/__init__.py b/lib/ansible/plugins/netconf/__init__.py index 36d082b2c86..e99efbdf1f9 100644 --- a/lib/ansible/plugins/netconf/__init__.py +++ b/lib/ansible/plugins/netconf/__init__.py @@ -84,7 +84,7 @@ class NetconfBase(AnsiblePlugin): :execute_rpc: RPC to be execute on remote device :load_configuration: Loads given configuration on device - Note: rpc support depends on the capabilites of remote device. + Note: rpc support depends on the capabilities of remote device. :returns: Returns output received from remote device as byte string Note: the 'result' or 'error' from response should to be converted to object diff --git a/lib/ansible/plugins/shell/powershell.py b/lib/ansible/plugins/shell/powershell.py index 11d1cfcc060..cd96e4c5077 100644 --- a/lib/ansible/plugins/shell/powershell.py +++ b/lib/ansible/plugins/shell/powershell.py @@ -82,7 +82,7 @@ class ShellModule(ShellBase): # use normpath() to remove doubled slashed and convert forward to backslashes parts = [ntpath.normpath(self._unquote(arg)) for arg in args] - # Becuase ntpath.join treats any component that begins with a backslash as an absolute path, + # Because ntpath.join treats any component that begins with a backslash as an absolute path, # we have to strip slashes from at least the beginning, otherwise join will ignore all previous # path components except for the drive. return ntpath.join(parts[0], *[part.strip('\\') for part in parts[1:]]) diff --git a/lib/ansible/utils/collection_loader/_collection_finder.py b/lib/ansible/utils/collection_loader/_collection_finder.py index 5f5f9476d26..eedc5def72f 100644 --- a/lib/ansible/utils/collection_loader/_collection_finder.py +++ b/lib/ansible/utils/collection_loader/_collection_finder.py @@ -954,7 +954,7 @@ class AnsibleCollectionRef: return False return all( - # NOTE: keywords and identifiers are different in differnt Pythons + # NOTE: keywords and identifiers are different in different Pythons not iskeyword(ns_or_name) and is_python_identifier(ns_or_name) for ns_or_name in collection_name.split(u'.') ) diff --git a/lib/ansible/utils/plugin_docs.py b/lib/ansible/utils/plugin_docs.py index eb03dc081c9..31134aff3b5 100644 --- a/lib/ansible/utils/plugin_docs.py +++ b/lib/ansible/utils/plugin_docs.py @@ -37,7 +37,7 @@ def merge_fragment(target, source): elif isinstance(target[key], MutableSequence): value = sorted(frozenset(value + target[key])) else: - raise Exception("Attempt to extend a documentation fragement, invalid type for %s" % key) + raise Exception("Attempt to extend a documentation fragment, invalid type for %s" % key) target[key] = value