mirror of
https://git.launchpad.net/ubuntu-dev-tools
synced 2025-04-16 21:01:10 +00:00
Port grep-merges to python 3
This commit is contained in:
parent
05ce00a49a
commit
3052bfcc16
20
grep-merges
20
grep-merges
@ -1,4 +1,4 @@
|
||||
#! /usr/bin/python
|
||||
#! /usr/bin/python3
|
||||
#
|
||||
# grep-merges - search for pending merges from Debian
|
||||
#
|
||||
@ -51,12 +51,12 @@ def main():
|
||||
url = 'https://merges.ubuntu.com/%s.json' % component
|
||||
try:
|
||||
headers, page = Http().request(url)
|
||||
except HttpLib2Error, e:
|
||||
print >> sys.stderr, str(e)
|
||||
except HttpLib2Error as e:
|
||||
print(str(e), file=sys.stderr)
|
||||
sys.exit(1)
|
||||
if headers.status != 200:
|
||||
print >> sys.stderr, "%s: %s %s" % (url, headers.status,
|
||||
headers.reason)
|
||||
print("%s: %s %s" % (url, headers.status, headers.reason),
|
||||
file=sys.stderr)
|
||||
sys.exit(1)
|
||||
|
||||
for merge in json.loads(page):
|
||||
@ -66,16 +66,12 @@ def main():
|
||||
author = merge['user']
|
||||
if merge.get('uploader'):
|
||||
uploader = '(%s)' % merge['uploader']
|
||||
try:
|
||||
teams = merge['teams']
|
||||
except e:
|
||||
teams = []
|
||||
teams = merge.get('teams', [])
|
||||
|
||||
pretty_uploader = u'{} {}'.format(author, uploader)
|
||||
pretty_uploader = '{} {}'.format(author, uploader)
|
||||
if (match is None or match in package or match in author
|
||||
or match in uploader or match in teams):
|
||||
print '%s\t%s' % (package.encode("utf-8"),
|
||||
pretty_uploader.encode("utf-8"))
|
||||
print('%s\t%s' % (package, pretty_uploader))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
2
setup.py
2
setup.py
@ -23,6 +23,7 @@ if sys.version_info[0] >= 3:
|
||||
'check-symbols',
|
||||
'dch-repeat',
|
||||
'grab-merge',
|
||||
'grep-merges',
|
||||
'mk-sbuild',
|
||||
'pbuilder-dist-simple',
|
||||
'pull-debian-source',
|
||||
@ -38,7 +39,6 @@ if sys.version_info[0] >= 3:
|
||||
]
|
||||
else:
|
||||
scripts = [
|
||||
'grep-merges',
|
||||
'hugdaylist',
|
||||
'import-bug-from-debian',
|
||||
'merge-changelog',
|
||||
|
Loading…
x
Reference in New Issue
Block a user