diff options
author | Toshio Kuratomi <a.badger@gmail.com> | 2016-09-06 22:54:17 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-06 22:54:17 -0700 |
commit | 4ed88512e45112f9670560ac3f01707a40a7f5c5 (patch) | |
tree | 56a676d07eed2b298cde420decffa947a3869ff7 /lib/ansible/cli/vault.py | |
parent | 7a9395b5e0059836fd510f252a9753229c4c24cc (diff) | |
download | ansible-4ed88512e45112f9670560ac3f01707a40a7f5c5.tar.gz |
Move uses of to_bytes, to_text, to_native to use the module_utils version (#17423)
We couldn't copy to_unicode, to_bytes, to_str into module_utils because
of licensing. So once created it we had two sets of functions that did
the same things but had different implementations. To remedy that, this
change removes the ansible.utils.unicode versions of those functions.
Diffstat (limited to 'lib/ansible/cli/vault.py')
-rw-r--r-- | lib/ansible/cli/vault.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ansible/cli/vault.py b/lib/ansible/cli/vault.py index 85bdac6993..65657ca70e 100644 --- a/lib/ansible/cli/vault.py +++ b/lib/ansible/cli/vault.py @@ -26,7 +26,7 @@ from ansible.errors import AnsibleError, AnsibleOptionsError from ansible.parsing.dataloader import DataLoader from ansible.parsing.vault import VaultEditor from ansible.cli import CLI -from ansible.utils.unicode import to_unicode +from ansible.module_utils._text import to_text try: from __main__ import display @@ -163,7 +163,7 @@ class VaultCLI(CLI): # unicode here because we are displaying it and therefore can make # the decision that the display doesn't have to be precisely what # the input was (leave that to decrypt instead) - self.pager(to_unicode(self.editor.plaintext(f))) + self.pager(ansible.module_utils._text.to_text(self.editor.plaintext(f))) def execute_rekey(self): for f in self.args: |