StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update checkowners.py to support python3

Browse Source 
Update generated with 2to3.

Bug: N/A
Test: manually check OWNERS files
Change-Id: Idccc7ba36351854fe2b7a669a99c97f3f3a03d0e
This commit is contained in:
Orion Hodson
2022-04-04 13:22:38 +01:00
parent 5e0edffa3c
commit e421668192
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/checkowners.py
View File

@@ -5,8 +5,8 @@
import argparse import argparse
import re import re
import sys import sys
import urllib import urllib.request, urllib.parse, urllib.error
import urllib2 import urllib.request, urllib.error, urllib.parse
parser = argparse.ArgumentParser(description='Check OWNERS file syntax') parser = argparse.ArgumentParser(description='Check OWNERS file syntax')
parser.add_argument('-v', '--verbose', dest='verbose', parser.add_argument('-v', '--verbose', dest='verbose',
@@ -25,15 +25,15 @@ checked_addresses = {}
def echo(msg): def echo(msg):
if args.verbose: if args.verbose:
print msg print(msg)
def find_address(address): def find_address(address):
if address not in checked_addresses: if address not in checked_addresses:
request = (gerrit_server + '/accounts/?n=1&q=email:' request = (gerrit_server + '/accounts/?n=1&q=email:'
+ urllib.quote(address)) + urllib.parse.quote(address))
echo('Checking email address: ' + address) echo('Checking email address: ' + address)
result = urllib2.urlopen(request).read() result = urllib.request.urlopen(request).read()
checked_addresses[address] = result.find('"_account_id":') >= 0 checked_addresses[address] = result.find('"_account_id":') >= 0
if checked_addresses[address]: if checked_addresses[address]:
echo('Found email address: ' + address) echo('Found email address: ' + address)
@@ -43,7 +43,7 @@ def find_address(address):
def check_address(fname, num, address): def check_address(fname, num, address):
if find_address(address): if find_address(address):
return 0 return 0
print '%s:%d: ERROR: unknown email address: %s' % (fname, num, address) print('%s:%d: ERROR: unknown email address: %s' % (fname, num, address))
return 1 return 1
@@ -72,7 +72,7 @@ def main():
stripped_line = re.sub('#.*$', '', line).strip() stripped_line = re.sub('#.*$', '', line).strip()
if not patterns.match(stripped_line): if not patterns.match(stripped_line):
error += 1 error += 1
print '%s:%d: ERROR: unknown line [%s]' % (fname, num, line.strip()) print('%s:%d: ERROR: unknown line [%s]' % (fname, num, line.strip()))
elif args.check_address: elif args.check_address:
if perfile_pattern.match(stripped_line): if perfile_pattern.match(stripped_line):
for addr in perfile_pattern.match(stripped_line).group(1).split(','): for addr in perfile_pattern.match(stripped_line).group(1).split(','):