|
@@ -54,7 +54,7 @@ a_2@testing|2001-04-01 00:00:00|2001-07-01 00:00:00|200|200|200|200|0|0|0|192000
|
|
|
a_3@testing|2001-07-01 00:00:00|2001-10-01 00:00:00|300|300|300|300|0|0|0|2880000|0|9600|9600
|
|
|
a_4@testing|2001-10-01 00:00:00|2002-01-01 00:00:00|400|400|400|400|0|0|0|3840000|0|9600|9600
|
|
|
"""
|
|
|
- for ref, res in zip(univar_text.split("\n"), t_rast_univar.outputs.stdout.split("\n")):
|
|
|
+ for ref, res in zip(univar_text.split("\n"), t_rast_univar.outputs.stdout.encode('utf8').split("\n")):
|
|
|
if ref and res:
|
|
|
ref_line = ref.split("|", 1)[1]
|
|
|
res_line = res.split("|", 1)[1]
|
|
@@ -73,7 +73,7 @@ a_2@testing|2001-04-01 00:00:00|2001-07-01 00:00:00|200|200|200|200|0|0|0|192000
|
|
|
a_3@testing|2001-07-01 00:00:00|2001-10-01 00:00:00|300|300|300|300|0|0|0|2880000|0|9600|9600
|
|
|
a_4@testing|2001-10-01 00:00:00|2002-01-01 00:00:00|400|400|400|400|0|0|0|3840000|0|9600|9600
|
|
|
"""
|
|
|
- for ref, res in zip(univar_text.split("\n"), t_rast_univar.outputs.stdout.split("\n")):
|
|
|
+ for ref, res in zip(univar_text.split("\n"), t_rast_univar.outputs.stdout.encode('utf8').split("\n")):
|
|
|
if ref and res:
|
|
|
ref_line = ref.split("|", 1)[1]
|
|
|
res_line = res.split("|", 1)[1]
|
|
@@ -92,7 +92,7 @@ a_2@testing|2001-04-01 00:00:00|2001-07-01 00:00:00|200|200|200|200|0|0|0|19200|
|
|
|
a_3@testing|2001-07-01 00:00:00|2001-10-01 00:00:00|300|300|300|300|0|0|0|28800|0|96|96
|
|
|
a_4@testing|2001-10-01 00:00:00|2002-01-01 00:00:00|400|400|400|400|0|0|0|38400|0|96|96
|
|
|
"""
|
|
|
- for ref, res in zip(univar_text.split("\n"), t_rast_univar.outputs.stdout.split("\n")):
|
|
|
+ for ref, res in zip(univar_text.split("\n"), t_rast_univar.outputs.stdout.encode('utf8').split("\n")):
|
|
|
if ref and res:
|
|
|
ref_line = ref.split("|", 1)[1]
|
|
|
res_line = res.split("|", 1)[1]
|
|
@@ -113,7 +113,7 @@ a_4@testing|2001-10-01 00:00:00|2002-01-01 00:00:00|400|400|400|400|0|0|0|384000
|
|
|
"""
|
|
|
univar_output = open("univar_output.txt", "r").read()
|
|
|
|
|
|
- for ref, res in zip(univar_text.split("\n"), univar_output.split("\n")):
|
|
|
+ for ref, res in zip(univar_text.split("\n"), univar_output.encode('utf8').split("\n")):
|
|
|
if ref and res:
|
|
|
ref_line = ref.split("|", 1)[1]
|
|
|
res_line = res.split("|", 1)[1]
|
|
@@ -133,7 +133,7 @@ a_4@testing|2001-10-01 00:00:00|2002-01-01 00:00:00|400|400|400|400|0|0|0|384000
|
|
|
"""
|
|
|
univar_output = open("univar_output.txt", "r").read()
|
|
|
|
|
|
- for ref, res in zip(univar_text.split("\n"), univar_output.split("\n")):
|
|
|
+ for ref, res in zip(univar_text.split("\n"), univar_output.encode('utf8').split("\n")):
|
|
|
if ref and res:
|
|
|
ref_line = ref.split("|", 1)[1]
|
|
|
res_line = res.split("|", 1)[1]
|