Show More
@@ -1153,7 +1153,7 b' class Test(unittest.TestCase):' | |||||
1153 | killdaemons(env['DAEMON_PIDS']) |
|
1153 | killdaemons(env['DAEMON_PIDS']) | |
1154 | return ret |
|
1154 | return ret | |
1155 |
|
1155 | |||
1156 | output = '' |
|
1156 | output = b'' | |
1157 | proc.tochild.close() |
|
1157 | proc.tochild.close() | |
1158 |
|
1158 | |||
1159 | try: |
|
1159 | try: | |
@@ -1177,7 +1177,7 b' class Test(unittest.TestCase):' | |||||
1177 | output = re.sub(s, r, output) |
|
1177 | output = re.sub(s, r, output) | |
1178 |
|
1178 | |||
1179 | if normalizenewlines: |
|
1179 | if normalizenewlines: | |
1180 | output = output.replace('\r\n', '\n') |
|
1180 | output = output.replace(b'\r\n', b'\n') | |
1181 |
|
1181 | |||
1182 | return ret, output.splitlines(True) |
|
1182 | return ret, output.splitlines(True) | |
1183 |
|
1183 |
General Comments 0
You need to be logged in to leave comments.
Login now