223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed buggy behavior caused by assigning string instead of single-item list to readBuffer.

This commit is contained in:
Philip Eisenlohr 2015-10-07 01:03:26 +00:00
parent f3f53bcbce
commit 801d57af4c
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/damask/asciitable.py
View File

@ -167,7 +167,7 @@ class ASCIItable():
try: try:
self.__IO__['in'].seek(0) # try to rewind self.__IO__['in'].seek(0) # try to rewind
except: except:
self.__IO__['readBuffer'] = firstline # or at least save data in buffer self.__IO__['readBuffer'] = [firstline] # or at least save data in buffer
try: try:
self.__IO__['dataStart'] = self.__IO__['in'].tell() # current file position is at start of data self.__IO__['dataStart'] = self.__IO__['in'].tell() # current file position is at start of data
except IOError: except IOError:
@ -405,13 +405,8 @@ class ASCIItable():
''' '''
read next line (possibly buffered) and parse it into data array read next line (possibly buffered) and parse it into data array
''' '''
if not isinstance(self.__IO__['readBuffer'], (str, unicode)): self.line = self.__IO__['readBuffer'].pop(0) if len(self.__IO__['readBuffer']) > 0 \
if len(self.__IO__['readBuffer']) > 0: else self.__IO__['in'].readline() # take buffered content or get next data row from file
self.line = self.__IO__['readBuffer'].pop(0) # take buffered content
else:
self.line = self.__IO__['in'].readline() # get next data row from file
else:
self.line=self.__IO__['readBuffer']
if not advance: if not advance:
self.__IO__['readBuffer'].append(self.line) # keep line just read in buffer self.__IO__['readBuffer'].append(self.line) # keep line just read in buffer