From 945ea9fc4108083e39c7e20c620200197e99b899 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Thu, 8 Mar 2018 10:43:02 +0900
Subject: [PATCH] merge_jars.py: Fix for python 3 compatibility

* ZipFile.read returns byte and not string
* dict.iteritems() was removed in Python 3

Change-Id: Id3c0edf7f554150c948cbfdba0b1b24a5d3ad51e
---
 tools/merge_jars.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/merge_jars.py b/tools/merge_jars.py
index 46016c0d21..89e83ca4f3 100755
--- a/tools/merge_jars.py
+++ b/tools/merge_jars.py
@@ -39,12 +39,12 @@ try:
             continue
           elif n.startswith(SERVICES):
             # Concatenate all provider configuration files.
-            services[n] += inzip.read(n)
+            services[n] += inzip.read(n).decode("UTF-8")
             continue
           outzip.writestr(info, inzip.read(n))
           seen.add(n)
 
-    for n, v in services.iteritems():
+    for n, v in list(services.items()):
       outzip.writestr(n, v)
 except Exception as err:
   exit('Failed to merge jars: %s' % err)