opendev/gerrit
Code Issues Proposed changes

merge_jars.py: Fix for python 3 compatibility

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

Change-Id: Id3c0edf7f554150c948cbfdba0b1b24a5d3ad51e
This commit is contained in:
David Pursehouse 2018-03-08 10:43:02 +09:00
parent ffb6e8ca6e
commit 945ea9fc41
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/merge_jars.py
View File

@ -39,12 +39,12 @@ try:
continue continue
elif n.startswith(SERVICES): elif n.startswith(SERVICES):
# Concatenate all provider configuration files. # Concatenate all provider configuration files.
services[n] += inzip.read(n) services[n] += inzip.read(n).decode("UTF-8")
continue continue
outzip.writestr(info, inzip.read(n)) outzip.writestr(info, inzip.read(n))
seen.add(n) seen.add(n)
for n, v in services.iteritems(): for n, v in list(services.items()):
outzip.writestr(n, v) outzip.writestr(n, v)
except Exception as err: except Exception as err:
exit('Failed to merge jars: %s' % err) exit('Failed to merge jars: %s' % err)