So far the gerrit build tool chain works as expected on Python 3. The only problems that we are running into in merge_jars.py: * ZipFile.read is returning byte and not string * dict.iteritems() was removed in Python 3 Luckily, those problems can be easily rectified and code can be adjusted to be compatible with both Python version 2 and 3. Bug: Issue 7002 Change-Id: I487253b0e2e6fe4428fe60d57879424f85a198a0
		
			
				
	
	
		
			53 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Python
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			53 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Python
		
	
	
		
			Executable File
		
	
	
	
	
#!/usr/bin/env python
 | 
						|
# Copyright (C) 2015 The Android Open Source Project
 | 
						|
#
 | 
						|
# Licensed under the Apache License, Version 2.0 (the "License");
 | 
						|
# you may not use this file except in compliance with the License.
 | 
						|
# You may obtain a copy of the License at
 | 
						|
#
 | 
						|
# http://www.apache.org/licenses/LICENSE-2.0
 | 
						|
#
 | 
						|
# Unless required by applicable law or agreed to in writing, software
 | 
						|
# distributed under the License is distributed on an "AS IS" BASIS,
 | 
						|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
						|
# See the License for the specific language governing permissions and
 | 
						|
# limitations under the License.
 | 
						|
 | 
						|
from __future__ import print_function
 | 
						|
import collections
 | 
						|
import sys
 | 
						|
import zipfile
 | 
						|
import io
 | 
						|
 | 
						|
if len(sys.argv) < 3:
 | 
						|
  print('usage: %s <out.zip> <in.zip>...' % sys.argv[0], file=sys.stderr)
 | 
						|
  exit(1)
 | 
						|
 | 
						|
outfile = sys.argv[1]
 | 
						|
infiles = sys.argv[2:]
 | 
						|
seen = set()
 | 
						|
SERVICES = 'META-INF/services/'
 | 
						|
 | 
						|
try:
 | 
						|
  with zipfile.ZipFile(outfile, 'w') as outzip:
 | 
						|
    services = collections.defaultdict(lambda: '')
 | 
						|
    for infile in infiles:
 | 
						|
      with zipfile.ZipFile(infile) as inzip:
 | 
						|
        for info in inzip.infolist():
 | 
						|
          n = info.filename
 | 
						|
          if n in seen:
 | 
						|
            continue
 | 
						|
          elif n.startswith(SERVICES):
 | 
						|
            # Concatenate all provider configuration files.
 | 
						|
            myfile = inzip.open(n, 'r')
 | 
						|
            myfile = io.TextIOWrapper(myfile, encoding='iso-8859-1', newline='')
 | 
						|
            services[n] += myfile.read()
 | 
						|
            continue
 | 
						|
          outzip.writestr(info, inzip.read(n))
 | 
						|
          seen.add(n)
 | 
						|
 | 
						|
    for n, v in services.items():
 | 
						|
      outzip.writestr(n, v)
 | 
						|
except Exception as err:
 | 
						|
  exit('Failed to merge jars: %s' % err)
 |