From 3d0cca885dfd387f92a0ac92d665485e723b1898 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 22 Jul 2019 17:53:26 +0000 Subject: [PATCH] Py2/3 compatibility changes - Legacy-Id: 16574 --- bin/mergeready | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/mergeready b/bin/mergeready index d5e826838..8d86e0fa2 100755 --- a/bin/mergeready +++ b/bin/mergeready @@ -72,7 +72,7 @@ if len(sys.argv) < 1: try: opts, files = getopt.gnu_getopt(sys.argv[1:], "hvV", ["help", "version","verbose",]) -except Exception, e: +except Exception as e: print( "%s: %s" % (program, e)) sys.exit(1) @@ -153,7 +153,7 @@ def split_loginfo(line): # Get repository information svn_info = {} -for line in pipe('svn info .').splitlines(): +for line in pipe('svn info .').decode('utf-8').splitlines(): if line: key, value = line.strip().split(':', 1) svn_info[key] = value.strip() @@ -179,7 +179,7 @@ merged_revs = {} write_cache = False loginfo_format = r'^r[0-9]+ \| [^@]+@[^@]+ \| \d\d\d\d-\d\d-\d\d ' 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: sys.stderr.write('.') if line in mergeinfo: