From b5615f9f2c07035740ff0b489a893a29bdb7b15a Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Wed, 18 Jul 2018 17:25:00 -0400
Subject: [PATCH] Fix some broken tests for Python 3

---
 Fix-some-broken-tests-for-Python-3.patch | 81 ++++++++++++++++++++++++
 krb5.spec                                |  6 +-
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 Fix-some-broken-tests-for-Python-3.patch

diff --git a/Fix-some-broken-tests-for-Python-3.patch b/Fix-some-broken-tests-for-Python-3.patch
new file mode 100644
index 0000000..42825b0
--- /dev/null
+++ b/Fix-some-broken-tests-for-Python-3.patch
@@ -0,0 +1,81 @@
+From eb60404564852a262d4082c3e38086742afb1bd9 Mon Sep 17 00:00:00 2001
+From: Robbie Harwood <rharwood@redhat.com>
+Date: Mon, 16 Jul 2018 16:44:01 -0400
+Subject: [PATCH] Fix some broken tests for Python 3
+
+Remove python2 dependencies in .travis.yml and add python3-paste.
+Convert t_daemon.py and jsonwalker.py to python3.  csjon has no
+python3 version, so replace it with python's built-in JSON module.
+
+python3-pyrad isn't available for Trusty, so krad and OTP tests are
+currently not exercised by Travis.
+
+[ghudson@mit.edu: squashed commits; edited commit message]
+
+ticket: 8710
+(cherry picked from commit d1fb3551c0dff5c3e6555b31fcbf04ff04d577fe)
+[rharwood@redhat.com: .travis.yml]
+---
+ src/lib/krad/t_daemon.py |  2 +-
+ src/tests/jsonwalker.py  | 16 +++++-----------
+ 2 files changed, 6 insertions(+), 12 deletions(-)
+
+diff --git a/src/lib/krad/t_daemon.py b/src/lib/krad/t_daemon.py
+index 7d7a5d0c8..7668cd7f8 100755
+--- a/src/lib/krad/t_daemon.py
++++ b/src/lib/krad/t_daemon.py
+@@ -23,7 +23,7 @@
+ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+-import StringIO
++from io import StringIO
+ import os
+ import sys
+ import signal
+diff --git a/src/tests/jsonwalker.py b/src/tests/jsonwalker.py
+index 7a0675e08..1880363d2 100644
+--- a/src/tests/jsonwalker.py
++++ b/src/tests/jsonwalker.py
+@@ -1,10 +1,5 @@
+ import sys
+-try:
+-    import cjson
+-except ImportError:
+-    print("Warning: skipping audit log verification because the cjson module" \
+-          " is unavailable")
+-    sys.exit(0)
++import json
+ from collections import defaultdict
+ from optparse import OptionParser
+ 
+@@ -72,7 +67,7 @@ class Parser(object):
+         """
+         Generator that works through dictionary.
+         """
+-        for a,v in adict.iteritems():
++        for a,v in adict.items():
+             if isinstance(v,dict):
+                 for (attrpath,u) in self._walk(v):
+                     yield (a+'.'+attrpath,u)
+@@ -93,17 +88,16 @@ if __name__ == '__main__':
+         with open(options.filename, 'r') as f:
+             content = list()
+             for l in f:
+-                content.append(cjson.decode(l.rstrip()))
++                content.append(json.loads(l.rstrip()))
+         f.close()
+     else:
+-        print('Input file in jason format is required')
++        print('Input file in JSON format is required')
+         exit()
+ 
+     defaults = None
+     if options.defaults is not None:
+         with open(options.defaults, 'r') as f:
+-            defaults = cjson.decode(f.read())
+-        f.close()
++            defaults = json.load(f)
+ 
+     # run test
+     p = Parser(defaults)
diff --git a/krb5.spec b/krb5.spec
index 646254f..4fa6c6c 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -18,7 +18,7 @@ Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.16.1
 # for prerelease, should be e.g., 0.% {prerelease}.1% { ?dist } (without spaces)
-Release: 13%{?dist}
+Release: 14%{?dist}
 
 # lookaside-cached sources; two downloads and a build artifact
 Source0: https://web.mit.edu/kerberos/dist/krb5/1.16/krb5-%{version}%{prerelease}.tar.gz
@@ -97,6 +97,7 @@ Patch77: Use-SHA-256-instead-of-MD5-for-audit-ticket-IDs.patch
 Patch78: Add-k5test-mark-function.patch
 Patch79: Convert-Python-tests-to-Python-3.patch
 Patch80: Zap-copy-of-secret-in-RC4-string-to-key.patch
+Patch81: Fix-some-broken-tests-for-Python-3.patch
 
 License: MIT
 URL: http://web.mit.edu/kerberos/www/
@@ -743,6 +744,9 @@ exit 0
 %{_libdir}/libkadm5srv_mit.so.*
 
 %changelog
+* Wed Jul 18 2018 Robbie Harwood <rharwood@redhat.com> - 1.16.1-14
+- Fix some broken tests for Python 3
+
 * Mon Jul 16 2018 Robbie Harwood <rharwood@redhat.com> - 1.16.1-13
 - Zap copy of secret in RC4 string-to-key