altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 6 Packages Projects Releases Wiki Activity

Py2/3 compatibility changes

Browse source 
- Legacy-Id: 16574
This commit is contained in:
Henrik Levkowetz 2019-07-22 17:53:26 +00:00
parent 915d8e3c2a
commit 3d0cca885d
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
bin/mergeready
View file

@ -72,7 +72,7 @@ if len(sys.argv) < 1:
try: try:
opts, files = getopt.gnu_getopt(sys.argv[1:], "hvV", ["help", "version","verbose",]) opts, files = getopt.gnu_getopt(sys.argv[1:], "hvV", ["help", "version","verbose",])
except Exception, e: except Exception as e:
print( "%s: %s" % (program, e)) print( "%s: %s" % (program, e))
sys.exit(1) sys.exit(1)
@ -153,7 +153,7 @@ def split_loginfo(line):
# Get repository information # Get repository information
svn_info = {} svn_info = {}
for line in pipe('svn info .').splitlines(): for line in pipe('svn info .').decode('utf-8').splitlines():
if line: if line:
key, value = line.strip().split(':', 1) key, value = line.strip().split(':', 1)
svn_info[key] = value.strip() svn_info[key] = value.strip()
@ -179,7 +179,7 @@ merged_revs = {}
write_cache = False write_cache = False
loginfo_format = r'^r[0-9]+ \| [^@]+@[^@]+ \| \d\d\d\d-\d\d-\d\d ' loginfo_format = r'^r[0-9]+ \| [^@]+@[^@]+ \| \d\d\d\d-\d\d-\d\d '
note("Getting svn:mergeinfo for current branch") note("Getting svn:mergeinfo for current branch")
for line in pipe('svn propget svn:mergeinfo .').splitlines(): for line in pipe('svn propget svn:mergeinfo .').decode('utf-8').splitlines():
if opt_verbose: if opt_verbose:
sys.stderr.write('.') sys.stderr.write('.')
if line in mergeinfo: if line in mergeinfo: