From 3de056bc60b9f50e3cf0bfc088dba109aecd5f72 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Wed, 12 Jun 2019 11:00:59 +0200
Subject: [PATCH] ipaclient_test: Fix Python2 decode use with Python3
This is a remain of the Python2 version and has been fixed.
Fixed: #86 (AttributeError: 'str' object has no attribute 'decode')
---
roles/ipaserver/library/ipaserver_test.py | 39 +++++++++++++----------
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/roles/ipaserver/library/ipaserver_test.py b/roles/ipaserver/library/ipaserver_test.py
index 25fc3d7a..caf46214 100644
--- a/roles/ipaserver/library/ipaserver_test.py
+++ b/roles/ipaserver/library/ipaserver_test.py
@@ -469,23 +469,30 @@ def main():
# validate zonemgr
if options.zonemgr:
- try:
- # IDNA support requires unicode
- encoding = getattr(sys.stdin, 'encoding', None)
- if encoding is None:
- encoding = 'utf-8'
- value = options.zonemgr.decode(encoding)
+ if six.PY3:
with redirect_stdout(ansible_log):
- bindinstance.validate_zonemgr_str(value)
- except ValueError as e:
- # FIXME we can do this in better way
- # https://fedorahosted.org/freeipa/ticket/4804
- # decode to proper stderr encoding
- stderr_encoding = getattr(sys.stderr, 'encoding', None)
- if stderr_encoding is None:
- stderr_encoding = 'utf-8'
- error = unicode(e).encode(stderr_encoding)
- ansible_module.fail_json(msg=error)
+ bindinstance.validate_zonemgr_str(options.zonemgr)
+ else:
+ try:
+ # IDNA support requires unicode
+ encoding = getattr(sys.stdin, 'encoding', None)
+ if encoding is None:
+ encoding = 'utf-8'
+ if not isinstance(value, unicode):
+ value = options.zonemgr.decode(encoding)
+ else:
+ value = options.zonemgr
+ with redirect_stdout(ansible_log):
+ bindinstance.validate_zonemgr_str(value)
+ except ValueError as e:
+ # FIXME we can do this in better way
+ # https://fedorahosted.org/freeipa/ticket/4804
+ # decode to proper stderr encoding
+ stderr_encoding = getattr(sys.stderr, 'encoding', None)
+ if stderr_encoding is None:
+ stderr_encoding = 'utf-8'
+ error = unicode(e).encode(stderr_encoding)
+ ansible_module.fail_json(msg=error)
# external cert file paths are absolute
for path in options.external_cert_files:
--
GitLab