diff --git a/wetb/fast/fast_io.py b/wetb/fast/fast_io.py index 619a789791d94c969a134c08f546b6bb69589bea..cbb1c3f9d380fbf887d13b0b57c544a6c67a52ae 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 187dccfb4e4e0dafa34d43680c7b99974b105016..2b658e6bc27c277379b57d3a3c4811ed32c5f5ee 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']