Changeset af3e9f5 in sasview for src/sas/sascalc/dataloader

Timestamp:

Sep 22, 2017 7:07:02 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

849094a

Parents:

5c5e7fd

Message:

use decoded stream for danse reader

File:

• src/sas/sascalc/dataloader/readers/danse_reader.py (modified) (2 diffs)

src/sas/sascalc/dataloader/readers/danse_reader.py

@@ -80 +80 @@
         data_start_line = 1
         while read_on:
-            line = self.f_open.readline()
+            line = self.nextline()
             data_start_line += 1
             if line.find("DATA:") >= 0:
@@ -114 +114 @@
             raise FileContentsException(msg)
 
-        for line_num, data_str in enumerate(self.f_open.readlines()):
+        for line_num, data_str in enumerate(self.nextlines()):
             toks = data_str.split()
             try: