From e53674e741fa8a2268e4a663c3ffbc00d891123c Mon Sep 17 00:00:00 2001
From: Martin Basti <mbasti@redhat.com>
Date: Jun 28 2017 14:26:50 +0000
Subject: py3: ipa_otptoken_import: fix calling unicode on bytes


.decode() must be used instead

https://pagure.io/freeipa/issue/4985

Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>

---

diff --git a/ipaserver/install/ipa_otptoken_import.py b/ipaserver/install/ipa_otptoken_import.py
index b451a0f..4a874e8 100644
--- a/ipaserver/install/ipa_otptoken_import.py
+++ b/ipaserver/install/ipa_otptoken_import.py
@@ -315,7 +315,11 @@ class PSKCKeyPackage(object):
         ('model',       'ipatokenmodel',           lambda v, o: v.strip()),
         ('serial',      'ipatokenserial',          lambda v, o: v.strip()),
         ('issueno',     'ipatokenserial',          lambda v, o: o.get('ipatokenserial', '') + '-' + v.strip()),
-        ('key',         'ipatokenotpkey',          lambda v, o: unicode(base64.b32encode(v))),
+        (
+            'key',
+            'ipatokenotpkey',
+            lambda v, o: base64.b32encode(v).decode('ascii')
+        ),
         ('digits',      'ipatokenotpdigits',       lambda v, o: v),
         ('algorithm',   'ipatokenotpalgorithm',    lambda v, o: v),
         ('counter',     'ipatokenhotpcounter',     lambda v, o: v),