Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-20 13:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Port grep-merges to python 3

Browse Source
This commit is contained in:
Stefano Rivera 2019-09-04 13:28:20 -03:00
parent 05ce00a49a
commit 3052bfcc16
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
grep-merges
View File

@ -1,4 +1,4 @@
#! /usr/bin/python #! /usr/bin/python3
# #
# grep-merges - search for pending merges from Debian # grep-merges - search for pending merges from Debian
# #
@ -51,12 +51,12 @@ def main():
url = 'https://merges.ubuntu.com/%s.json' % component url = 'https://merges.ubuntu.com/%s.json' % component
try: try:
headers, page = Http().request(url) headers, page = Http().request(url)
except HttpLib2Error, e: except HttpLib2Error as e:
print >> sys.stderr, str(e) print(str(e), file=sys.stderr)
sys.exit(1) sys.exit(1)
if headers.status != 200: if headers.status != 200:
print >> sys.stderr, "%s: %s %s" % (url, headers.status, print("%s: %s %s" % (url, headers.status, headers.reason),
headers.reason) file=sys.stderr)
sys.exit(1) sys.exit(1)
for merge in json.loads(page): for merge in json.loads(page):
@ -66,16 +66,12 @@ def main():
author = merge['user'] author = merge['user']
if merge.get('uploader'): if merge.get('uploader'):
uploader = '(%s)' % merge['uploader'] uploader = '(%s)' % merge['uploader']
try: teams = merge.get('teams', [])
teams = merge['teams']
except e:
teams = []
pretty_uploader = u'{} {}'.format(author, uploader) pretty_uploader = '{} {}'.format(author, uploader)
if (match is None or match in package or match in author if (match is None or match in package or match in author
or match in uploader or match in teams): or match in uploader or match in teams):
print '%s\t%s' % (package.encode("utf-8"), print('%s\t%s' % (package, pretty_uploader))
pretty_uploader.encode("utf-8"))
if __name__ == '__main__': if __name__ == '__main__':

2
setup.py
View File

@ -23,6 +23,7 @@ if sys.version_info[0] >= 3:
'check-symbols', 'check-symbols',
'dch-repeat', 'dch-repeat',
'grab-merge', 'grab-merge',
'grep-merges',
'mk-sbuild', 'mk-sbuild',
'pbuilder-dist-simple', 'pbuilder-dist-simple',
'pull-debian-source', 'pull-debian-source',
@ -38,7 +39,6 @@ if sys.version_info[0] >= 3:
] ]
else: else:
scripts = [ scripts = [
'grep-merges',
'hugdaylist', 'hugdaylist',
'import-bug-from-debian', 'import-bug-from-debian',
'merge-changelog', 'merge-changelog',