Fix lastpass lookup error
Fixes #42062.
(cherry picked from commit 15fb9d3bc0
)
This commit is contained in:
parent
e68541fa88
commit
a17b664b38
2 changed files with 5 additions and 2 deletions
|
@ -0,0 +1,2 @@
|
|||
bugfixes:
|
||||
- "fix lastpass lookup failure on python 3 (https://github.com/ansible/ansible/issues/42062)"
|
|
@ -38,6 +38,7 @@ RETURN = """
|
|||
from subprocess import Popen, PIPE
|
||||
|
||||
from ansible.errors import AnsibleError
|
||||
from ansible.module_utils._text import to_bytes, to_text
|
||||
from ansible.plugins.lookup import LookupBase
|
||||
|
||||
|
||||
|
@ -61,11 +62,11 @@ class LPass(object):
|
|||
|
||||
def _run(self, args, stdin=None, expected_rc=0):
|
||||
p = Popen([self.cli_path] + args, stdout=PIPE, stderr=PIPE, stdin=PIPE)
|
||||
out, err = p.communicate(stdin)
|
||||
out, err = p.communicate(to_bytes(stdin))
|
||||
rc = p.wait()
|
||||
if rc != expected_rc:
|
||||
raise LPassException(err)
|
||||
return out, err
|
||||
return to_text(out, errors='surrogate_or_strict'), to_text(err, errors='surrogate_or_strict')
|
||||
|
||||
def _build_args(self, command, args=None):
|
||||
if args is None:
|
||||
|
|
Loading…
Reference in a new issue