internet/ansible-freeipa
4
0
Fork 0
mirror of https://github.com/freeipa/ansible-freeipa.git synced 2026-06-23 09:14:43 +00:00
Code Issues Projects Releases Wiki Activity

ipaclient_test: Fix Python2 decode use with Python3

Browse Source 
This is a remain of the Python2 version and has been fixed.

Fixed: #86 (AttributeError: 'str' object has no attribute 'decode')
This commit is contained in:
Thomas Woerner
2019-06-12 11:00:59 +02:00
parent 6d328caa59
commit 3de056bc60
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
roles/ipaserver/library/ipaserver_test.py
View File

@@ -469,12 +469,19 @@ def main():
# validate zonemgr # validate zonemgr
if options.zonemgr: if options.zonemgr:
if six.PY3:
with redirect_stdout(ansible_log):
bindinstance.validate_zonemgr_str(options.zonemgr)
else:
try: try:
# IDNA support requires unicode # IDNA support requires unicode
encoding = getattr(sys.stdin, 'encoding', None) encoding = getattr(sys.stdin, 'encoding', None)
if encoding is None: if encoding is None:
encoding = 'utf-8' encoding = 'utf-8'
if not isinstance(value, unicode):
value = options.zonemgr.decode(encoding) value = options.zonemgr.decode(encoding)
else:
value = options.zonemgr
with redirect_stdout(ansible_log): with redirect_stdout(ansible_log):
bindinstance.validate_zonemgr_str(value) bindinstance.validate_zonemgr_str(value)
except ValueError as e: except ValueError as e: