From 3b1c209c10d6fda7d7aeb6f99c44246dfa2970b1 Mon Sep 17 00:00:00 2001
From: "Mads M. Pedersen" <mmpe@dtu.dk>
Date: Wed, 12 Oct 2016 07:54:54 +0200
Subject: [PATCH] fast_io encoding fix
---
wetb/fast/fast_io.py | 4 ++--
wetb/fast/tests/test_fast_io.py | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/wetb/fast/fast_io.py b/wetb/fast/fast_io.py
index 619a789..cbb1c3f 100644
--- a/wetb/fast/fast_io.py
+++ b/wetb/fast/fast_io.py
@@ -38,7 +38,7 @@ def load_output(filename):
"""
assert os.path.isfile(filename), "File, %s, does not exists" % filename
- with open(filename, 'r', encoding='utf-8') as f:
+ with open(filename, 'r') as f:
try:
f.readline()
except UnicodeDecodeError:
@@ -46,7 +46,7 @@ def load_output(filename):
return load_ascii_output(filename)
def load_ascii_output(filename):
- with open(filename, encoding='utf-8') as f:
+ with open(filename) as f:
info = {}
info['name'] = os.path.splitext(os.path.basename(filename))[0]
try:
diff --git a/wetb/fast/tests/test_fast_io.py b/wetb/fast/tests/test_fast_io.py
index 187dccf..2b658e6 100644
--- a/wetb/fast/tests/test_fast_io.py
+++ b/wetb/fast/tests/test_fast_io.py
@@ -35,6 +35,13 @@ class TestFastIO(unittest.TestCase):
self.assertEqual(info['attribute_units'][7], 'deg/s^2')
self.assertAlmostEqual(data[10, 4], 138.822277739535)
+ def test_load_output2(self):
+ data, info = load_output(testfilepath + 'DTU10MW2.out')
+ self.assertEqual(info['name'], "DTU10MW2")
+ self.assertEqual(info['attribute_names'][-1], "RotPwr")
+ self.assertEqual(info['attribute_units'][-1], "kW")
+
+
if __name__ == "__main__":
#import sys;sys.argv = ['', 'Test.testload_output']
--
GitLab