Changeset 26183bf in sasview for src/sas/sascalc


Ignore:
Timestamp:
Sep 22, 2017 5: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:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/dataloader/file_reader_base_class.py

    r574adc7 r26183bf  
    7979        # Return a list of parsed entries that data_loader can manage 
    8080        return self.output 
     81 
     82    def nextline(self): 
     83        """ 
     84        Returns the next line in the file as a string. 
     85        """ 
     86        #return self.f_open.readline() 
     87        return self.f_open.readline().decode() 
     88 
     89    def nextlines(self): 
     90        """ 
     91        Returns the next line in the file as a string. 
     92        """ 
     93        for line in self.f_open: 
     94            #yield line 
     95            yield line.decode() 
     96 
     97    def readall(self): 
     98        """ 
     99        Returns the entire file as a string. 
     100        """ 
     101        #return self.f_open.read() 
     102        return self.f_open.read().decode() 
    81103 
    82104    def handle_error_message(self, msg): 
Note: See TracChangeset for help on using the changeset viewer.