Changeset 26183bf in sasview for src/sas/sascalc

Timestamp:

Sep 22, 2017 7:03:34 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:

a5bd87a

Parents:

56dac0b

Message:

flow data reads through a single interface so we can control bytes to unicode conversion

File:

• src/sas/sascalc/dataloader/file_reader_base_class.py (modified) (1 diff)

src/sas/sascalc/dataloader/file_reader_base_class.py

@@ -79 +79 @@
         # Return a list of parsed entries that data_loader can manage
         return self.output
+
+    def nextline(self):
+        """
+        Returns the next line in the file as a string.
+        """
+        #return self.f_open.readline()
+        return self.f_open.readline().decode()
+
+    def nextlines(self):
+        """
+        Returns the next line in the file as a string.
+        """
+        for line in self.f_open:
+            #yield line
+            yield line.decode()
+
+    def readall(self):
+        """
+        Returns the entire file as a string.
+        """
+        #return self.f_open.read()
+        return self.f_open.read().decode()
 
     def handle_error_message(self, msg):