diff options
author | Martin Basti <mbasti@redhat.com> | 2016-12-14 10:12:05 +0100 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2017-01-06 12:48:10 +0100 |
commit | 35ba724de90b270773d91596de310291df745df0 (patch) | |
tree | 93c8e02f6228baaa0a65da5902a99ae068571f12 /ipasetup.py.in | |
parent | deaad95247fa9624bef0108bf3813f358fb17ee5 (diff) | |
download | freeipa-35ba724de90b270773d91596de310291df745df0.tar.gz freeipa-35ba724de90b270773d91596de310291df745df0.tar.xz freeipa-35ba724de90b270773d91596de310291df745df0.zip |
Py3: Fix ToASCII method
in Py2 to_text method returns Py2 non-unicode string, but in Py3 to_text method
returns Py3 default (unicode) string. So only in Py2 we have to decode
str to unicode.
https://fedorahosted.org/freeipa/ticket/5935
Reviewed-By: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'ipasetup.py.in')
-rw-r--r-- | ipasetup.py.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipasetup.py.in b/ipasetup.py.in index 6a33fb86f..c221e0de6 100644 --- a/ipasetup.py.in +++ b/ipasetup.py.in @@ -64,7 +64,7 @@ if SETUPTOOLS_VERSION < (8, 0, 0): PACKAGE_VERSION = { 'cryptography': 'cryptography >= 1.3.1', - 'dnspython': 'dnspython >= 1.13', + 'dnspython': 'dnspython >= 1.15', 'gssapi': 'gssapi >= 1.2.0', 'ipaclient': 'ipaclient == {}'.format(VERSION), 'ipalib': 'ipalib == {}'.format(VERSION), |