count *nix/windows newline chars properly for PyBasic file I/O

Author: RetiredWizard

PyBasic/basicparser.py

@@ -680,11 +680,23 @@ def __openstmt(self):
                 raise RuntimeError('File '+filename+' could not be opened in line ' + str(self.__line_number))
 
         if accessMode == "r+":
+            if hasattr(self.__file_handles,'newlines'):
+                try:
+                    self.__file_handles[filenum].readline()
+                except:
+                    pass
+                newlines = self.__file_handles.newlines
+            else:
+                newlines = None
             self.__file_handles[filenum].seek(0)
             filelen = 0
             for lines in self.__file_handles[filenum]:
-                filelen += (len(lines)+(0 if uname()[0].upper() == 'LINUX' or \
-                    implementation.name.upper() in ['MICROPYTHON','CIRCUITPYTHON'] else 1))
+                filelen += len(lines)
+                if newlines != None:
+                    filelen += len(newlines)-1
+                else:
+                    filelen += (0 if uname()[0].upper() == 'LINUX' or \
+                        implementation.name.upper() in ['MICROPYTHON','CIRCUITPYTHON'] else 1)
 
             self.__file_handles[filenum].seek(filelen)
 

PyBasic/program.py

@@ -146,13 +146,26 @@ def load(self, file, tmpfile):
 
         try:
             infile = open(file, 'r')
+            if hasattr(infile,'newlines'):
+                try:
+                    infile.readline()
+                except:
+                    pass
+                newlines = infile.newlines
+                infile.seek(0)
+            else:
+                newlines = None
             fIndex = 0
             fOffset = 0
             pgmLoad = False
             if file.split(".")[-1].upper() == "PGM":
                 pgmLoad = True
                 for fileLine in infile:
-                    fOffset += (len(fileLine) + (0 if self.__imp == 'X' else 1))
+                    fOffset += len(fileLine)
+                    if newlines != None:
+                        fOffset += len(newlines)-1
+                    elif self.__imp != 'X':
+                        fOffset += 1
                     if len(fileLine) >= 9 and fileLine[0:9] == "-999,-999":
                         break
 
@@ -173,8 +186,11 @@ def load(self, file, tmpfile):
                         if fileLine.strip().upper()[fileLine.strip().find(' '):].strip()[:4] == "DATA":
                             self.__data.addData(line_number,fIndex)
                         #self.add_stmt(Lexer().tokenize((fileLine.replace("\n","")).replace("\r","")),fIndex+fOffset,tmpfile)
-                    fIndex += (len(fileLine) + (0 if self.__imp == 'X' else 1))
-
+                    fIndex += len(fileLine)
+                    if newlines != None:
+                        fIndex += len(newlines)-1
+                    elif self.__imp != 'X':
+                        fIndex += 1
 
         except OSError:
             print("Could not read file")
@@ -204,10 +220,22 @@ def add_stmt(self, tokenlist, fIndex, tmpfile):
                 if tokenlist[1].lexeme == "DATA":
                     self.__data.addData(line_number,fIndex)
             else:
+                if hasattr(tmpfile,'newlines'):
+                    try:
+                        tmpfile.readline()
+                    except:
+                        pass
+                    newlines = tmpfile.newlines
+                else:
+                    newlines = None
                 tmpfile.seek(0)
                 filelen = 0
                 for lines in tmpfile:
-                    filelen += (len(lines)+(0 if self.__imp == 'X' else 1))
+                    filelen += len(lines)
+                    if newlines != None:
+                        filelen += len(newlines) - 1
+                    elif self.__imp != 'X':
+                        filelen += 1
 
                 self.__program[line_number] = -(filelen+1)
                 if tokenlist[1].lexeme == "DATA":

PyDOS.py

@@ -73,7 +73,7 @@ def PyDOS():
     global envVars
     if "envVars" not in globals().keys():
         envVars = {}
-    _VER = "1.44"
+    _VER = "1.45"
     prmpVals = ['>','(',')','&','|','\x1b','\b','<','=',' ',_VER,'\n','$','']
 
     print("Starting Py-DOS...")

README.md

@@ -200,10 +200,10 @@ down - the number of tiles connected down the matrix display
 
 If the parameters are omitted or not properly formatted, the program will prompt for each of the values.  
 
-**Playimage.py [filename[,filename2,filename3,etc,[seconds_to_display]]]** - (Circuitpython only, requires the adafruit_imageload library installed in the /lib folder) program to display .bmp, .jpg, .gif (incl animaged) or .png image files. If multiple comma 
+**Playimage.py [filename[,filename2,filename3,etc[],seconds_to_display]]]** - (Circuitpython only, requires the adafruit_imageload library installed in the /lib folder) program to display .bmp, .jpg, .gif (incl animated) or .png image files. If multiple comma 
 seperated files are entered a continous slide show is displayed with each image being 
 displayed for `seconds_to_display` seconds. Wildcard's in the format of *.xxx can be used
-as an input filename. If the program is loaded from PyDOS it attempts to determine the appropriate display configuration from the PyDOS environment, otherwise several display options are supported and selected depending on the existence of BOARD.Display or locally installed display libraries.
+as an input filename. If the program is loaded from PyDOS it attempts to determine the appropriate display configuration from the PyDOS environment, otherwise several display options are supported and selected depending on the existence of BOARD.DISPLAY or locally installed display libraries.
 
 **reboot.py** - performs a soft reboot (Micropython requires a Ctrl-D to complete)
 

lib/pydos_bcfg.py

@@ -47,7 +47,7 @@
     from machine import Pin
     try:
         led = "LED"
-        test = machine.Pin(led,Pin.OUT)
+        test = Pin(led,Pin.OUT)
     except:
         led = "D13"
 

lib/pydos_ui.py

@@ -32,7 +32,6 @@ def serial_bytes_available(self,timeout=1):
             retval = 0
         else:
             retval = 1
-        retval = 1 if retval else 0
 
         return retval