diff options
author | Olav Vitters <olav@vitters.nl> | 2015-01-25 21:54:13 +0100 |
---|---|---|
committer | Olav Vitters <olav@vitters.nl> | 2015-01-25 21:54:13 +0100 |
commit | a8a1ae5b207b52732090938cff1b054b3217d073 (patch) | |
tree | b2a063261dc1391ed2392c7db618a64a0cd40910 | |
parent | 218f5c5a2fb3da6978fdbcd3ef07fa5dcdb9539c (diff) | |
download | mgagnome-a8a1ae5b207b52732090938cff1b054b3217d073.tar mgagnome-a8a1ae5b207b52732090938cff1b054b3217d073.tar.gz mgagnome-a8a1ae5b207b52732090938cff1b054b3217d073.tar.bz2 mgagnome-a8a1ae5b207b52732090938cff1b054b3217d073.tar.xz mgagnome-a8a1ae5b207b52732090938cff1b054b3217d073.zip |
more python3 fixes
-rwxr-xr-x | mgagnome | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1546,7 +1546,7 @@ def cmd_parse_ftp_release_list(options, parser): if error: # XXX - ugly contents.seek(0) - lastline = contents.read().rstrip().splitlines()[-1] + lastline = contents.read().decode('utf-8').rstrip().splitlines()[-1] # Remove things like "ERROR: " and so on from the last line lastline = re.sub(r'^(?:[^ :]+:\s+)+', '', lastline) # Remove things like " - " (youri output from mgarepo submit) @@ -1569,7 +1569,7 @@ def cmd_parse_ftp_release_list(options, parser): cmd = ['/usr/sbin/sendmail', '-oi', '--'] cmd.extend([to]) p = subprocess.Popen(cmd, stdin=subprocess.PIPE) - p.stdin.write(msg.as_string()) + p.stdin.write(msg.as_bytes()) p.stdin.flush() p.stdin.close() p.wait() |