From 418afc9eed4019fd0ce62171b5bfc5149bca6e18 Mon Sep 17 00:00:00 2001
From: Daniel Brown <ddb@star.sr.bham.ac.uk>
Date: Tue, 3 May 2016 13:52:32 -0700
Subject: [PATCH] fixing utf8 pipe reading hopefully
---
pykat/finesse.py | 7 +++----
test/run_tests.py | 7 +++++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pykat/finesse.py b/pykat/finesse.py
index 44c0d9e..56e2955 100644
--- a/pykat/finesse.py
+++ b/pykat/finesse.py
@@ -28,6 +28,7 @@ from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
+import codecs
import uuid
import sys
import os
@@ -1498,8 +1499,6 @@ class kat(object):
duration = 2 # Duration for searching for open pipe
- import codecs
-
try:
while fifo is None:
try:
@@ -1517,8 +1516,8 @@ class kat(object):
for line in fifo:
- if (sys.version_info < (3, 0)):
- line = line.decode("utf8") # Make sure we're using unicode encoding
+ #if (sys.version_info < (3, 0)):
+ # line = line.decode("utf8") # Make sure we're using unicode encoding
v = line.split(u":", 1)
diff --git a/test/run_tests.py b/test/run_tests.py
index 764a2f5..ffa3705 100644
--- a/test/run_tests.py
+++ b/test/run_tests.py
@@ -17,7 +17,7 @@ errors = []
testdir = os.getcwd()
-print("----------------------------------------------------------------------------------------")
+
for path, folders, files in os.walk("./test_scripts"):
@@ -26,6 +26,7 @@ for path, folders, files in os.walk("./test_scripts"):
filename = os.path.join(path, filename)
with open(filename) as f:
+ print("!-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*")
print("RUNNING: " + filename)
try:
os.chdir(path)
@@ -45,7 +46,9 @@ for path, folders, files in os.walk("./test_scripts"):
sys.stderr.flush()
finally:
os.chdir(testdir)
- print("----------------------------------------------------------------------------------------")
+ print("!------------------------------------------------------------------------------------------------")
+ print("")
+ print("")
if len(errors) > 0:
--
GitLab