Update Exception handling and fstring fixes

Author: RetiredWizard

PyBasic/interpreter.py

@@ -27,16 +27,18 @@
 from lexer import Lexer
 from program import Program
 from sys import stderr,implementation
+try:
+    from traceback import print_exception
+except:
+    from sys import print_exception as sysprexcept
+    print_exception = lambda err,value=None,tb=None: sysprexcept(err)
 from os import listdir,rename,remove
 import gc
 try:
     from pydos_ui import input
 except:
     pass
 
-if implementation.name.upper() == 'MICROPYTHON':
-    from sys import print_exception
-
 gc.collect()
 if 'threshold' in dir(gc):
     gc.threshold(gc.mem_free() // 4 + gc.mem_alloc())
@@ -239,7 +241,5 @@ def main(passedIn=""):
 
         # Trap all exceptions so that interpreter keeps running
         except Exception as e:
-            if implementation.name.upper() == 'MICROPYTHON':
-                print_exception(e)
-            else:
-                print(e)
+            print_exception(e,e, \
+                e.__traceback__ if hasattr(e,'__traceback__') else None)

PyDOS.py

@@ -4,7 +4,13 @@
 except:
     sep = os.getcwd()[0]
 from time import localtime
-from sys import stdin,implementation,path,print_exception
+from sys import stdin,implementation,path
+try:
+    from traceback import print_exception,format_exception
+except:
+    from sys import print_exception as sysprexcept
+    print_exception = lambda err,value=None,tb=None: sysprexcept(err)
+    format_exception = lambda err,value=None,tb=None: [err]
 if not sep+'lib' in path:
     path.insert(1,sep+'lib')
 path.append(sep+'PyBasic')
@@ -67,7 +73,7 @@ def PyDOS():
     global envVars
     if "envVars" not in globals().keys():
         envVars = {}
-    _VER = "1.40"
+    _VER = "1.41"
     prmpVals = ['>','(',')','&','|','\x1b','\b','<','=',' ',_VER,'\n','$','']
 
     print("Starting Py-DOS...")
@@ -138,8 +144,10 @@ def exCmd(cFile,passedIn):
                 else:
                     exec(f"passedIn = '{passedIn}'\n{cf.read()}")
         except Exception as err:
-            print_exception(err)
-            envVars['lasterror'] = err
+            print_exception(err,err, \
+                err.__traceback__ if hasattr(err,'__traceback__') else None)
+            envVars['lasterror'] = format_exception(err,err, \
+                err.__traceback__ if hasattr(err,'__traceback__') else None)
         except KeyboardInterrupt:
             print("^C")
 
@@ -222,7 +230,7 @@ def dirLoop(tmpDir,lastDir,isFile,swPause,swWide,swRecur,prSum, \
             lastDir = ""
 
         if dirPat is None:
-            (quit,nLines) = scrnPause(swPause,nLines,["",f"Directory of {dPath.replace('/',('\\' if envVars.get('DIRSEP','/') == '\\' else '/'))}"])
+            (quit,nLines) = scrnPause(swPause,nLines,["","Directory of "+dPath.replace('/',('\\' if envVars.get('DIRSEP','/') == '\\' else '/'))])
             dirHeadPrntd = True
             nDirs += 2
             if swWide:
@@ -236,7 +244,7 @@ def dirLoop(tmpDir,lastDir,isFile,swPause,swWide,swRecur,prSum, \
             else:
                 scrAdj1 = 52 - min(scrWdth,52)
                 (quit,nLines) = scrnPause(swPause,nLines, \
-                    [f".{" "*(23-scrAdj1)}<DIR>",f"..{" "*(22-scrAdj1)}<DIR>"])
+                    [f'.{" "*(23-scrAdj1)}<DIR>',f'..{" "*(22-scrAdj1)}<DIR>'])
 
         for _dir in sorted([srtFnc(x,pFmt(dPath)) for x in os.listdir(dPath)]):
             _dir = _dir.split('*')[1]
@@ -267,7 +275,7 @@ def dirLoop(tmpDir,lastDir,isFile,swPause,swWide,swRecur,prSum, \
                     wideCount += 1
                     if not ForD:
                         (quit,nLines) = scrnPause(swPause,nLines, \
-                            [f"[{_dir[:13]}]{" "*(14-len(_dir[:13]))}"],"")
+                            [f'[{_dir[:13]}]{" "*(14-len(_dir[:13]))}'],"")
                     else:
                         (quit,nLines) = scrnPause(swPause,nLines, \
                             [_dir[:15]+" "*(16-len(_dir[:15]))],"")
@@ -278,11 +286,11 @@ def dirLoop(tmpDir,lastDir,isFile,swPause,swWide,swRecur,prSum, \
                         scrAdj1 = 52 - min(scrWdth,52)
                         scrAdj2 = min(13,65-min(scrWdth,65))
                         (quit,nLines) = scrnPause(swPause,nLines, \
-                            [f"{_dir[:max(8,scrWdth-26)]}{" "*(24-len(_dir)-scrAdj1)}<DIR>{" "*(18-scrAdj2)}{fTime[1]:02}-{fTime[2]:02}-{fTime[0]:04} {fTime[3]:02}:{fTime[4]:02}"])
+                            [f'{_dir[:max(8,scrWdth-26)]}{" "*(24-len(_dir)-scrAdj1)}<DIR>{" "*(18-scrAdj2)}{fTime[1]:02}-{fTime[2]:02}-{fTime[0]:04} {fTime[3]:02}:{fTime[4]:02}'])
                     else:
                         scrAdj1 = 65 - min(scrWdth,65)
                         (quit,nLines) = scrnPause(swPause,nLines, \
-                            [f"{_dir[:max(8,scrWdth-20-len(fSize))]}{" "*(36-len(_dir)+10-len(fSize)-scrAdj1)}{fSize} {fTime[1]:02}-{fTime[2]:02}-{fTime[0]:04} {fTime[3]:02}:{fTime[4]:02}"])
+                            [f'{_dir[:max(8,scrWdth-20-len(fSize))]}{" "*(36-len(_dir)+10-len(fSize)-scrAdj1)}{fSize} {fTime[1]:02}-{fTime[2]:02}-{fTime[0]:04} {fTime[3]:02}:{fTime[4]:02}'])
 
                 if quit:
                     break
@@ -316,8 +324,8 @@ def dirLoop(tmpDir,lastDir,isFile,swPause,swWide,swRecur,prSum, \
 
                 scrAdj1 = 65 - min(scrWdth,65)
                 (quit,nLines) = scrnPause(swPause,nLines, \
-                    [(f"{" "*(4-len(str(nFiles)))} {nFiles} File(s){" "*(32-len(str(tFSize))-scrAdj1)} {tFSize} Bytes.")[:scrWdth], \
-                    (f"{" "*(4-len(str(nDirs)))} {nDirs} Dir(s){" "*(33-len(str(availDisk))-scrAdj1)} {availDisk} Bytes free.")[:scrWdth],""],"")
+                    [(f'{" "*(4-len(str(nFiles)))} {nFiles} File(s){" "*(32-len(str(tFSize))-scrAdj1)} {tFSize} Bytes.')[:scrWdth], \
+                    (f'{" "*(4-len(str(nDirs)))} {nDirs} Dir(s){" "*(33-len(str(availDisk))-scrAdj1)} {availDisk} Bytes free.')[:scrWdth],""],"")
 
         return (nLines,nFiles,tFSize,nDirs,quit)
 
@@ -637,7 +645,7 @@ def readBATFile(BATfile):
             print(f'The current date is: {"MonTueWedThuFriSatSun"[i:i+3]} {localtime()[1]:02}/{localtime()[2]:02}/{localtime()[0]:04}')
 
         elif cmd == "TIME":
-            print(f"The current time is: {localtime()[3]%12}:{localtime()[4]:02}:{localtime()[5]:02} {["AM","PM"][localtime()[3]//12]}")
+            print(f'The current time is: {localtime()[3]%12}:{localtime()[4]:02}:{localtime()[5]:02} {["AM","PM"][localtime()[3]//12]}')
 
         elif cmd == "MEM":
             gc.collect()

blink.py

@@ -12,12 +12,16 @@
 
 def blink(ledPin=None):
     cmnd = ""
+    minus = False
 
     if ledPin == None or ledPin == "":
         ledPin = Pydos_hw.led
     elif sys.implementation.name.upper() == 'CIRCUITPYTHON':
         ledPin = getattr(board,str(ledPin).upper().replace("'","").replace('"',''))
     else:
+        if type(ledPin) == str:
+            if ledPin[:1] == '-':
+                minus = True
         try:
             ledPin = int(ledPin)
         except:
@@ -26,8 +30,8 @@ def blink(ledPin=None):
 
 
     # Micropython: pass a negative pin value if the led turns off with a value of 1
-    if type(ledPin) == int and ledPin < 0:
-        ledPin = -ledPin
+    if (type(ledPin) == int and ledPin < 0) or minus:
+        ledPin = abs(ledPin)
         ledOff = True
     else:
         ledOff = False
@@ -111,4 +115,3 @@ def blink(ledPin=None):
     blink(passedIn)
 else:
     print("Enter 'blink.blink(pinNo=Default)' in the REPL to run.")
-

mpython/boardconfigs/pydos_bcfg_ESP module with ESP8266.py

@@ -0,0 +1,14 @@
+# PyDOS Board Configuration for 'Adafruit Feather HUZZAH ESP32'
+
+Pydos_pins = {
+    'sndPin' : (16,"D16 GPIO16"),
+    'led' : (-2,"D2 GPIO2"),
+    'I2C_NUM' : (1,None),
+    'SCL' : (5,"SCL GPIO5"),
+    'SDA' : (4,"SDA GPIO4"),
+    'SPI_NUM' : [(0,None)],
+    'SCK' : [(14,"SCK GPIO14")],
+    'MOSI' : [(13,"MO GPIO13")],
+    'MISO' : [(12,"MI GPIO12")],
+    'CS' : [(15,"D15 GPIO15")]
+}

sdmount.py

@@ -1,9 +1,13 @@
 from sys import implementation
 from pydos_hw import Pydos_hw
 import os
+try:
+    from traceback import print_exception
+except:
+    from sys import print_exception as sysprexcept
+    print_exception = lambda err,value=None,tb=None: sysprexcept(err)
 
 if implementation.name.upper() == "MICROPYTHON":
-    from sys import print_exception
     from machine import Pin
     try:
         from machine import SDCard
@@ -128,7 +132,8 @@ def do_mount(drive,spiNo):
                         Pydos_hw.SDdrive[spiNo] = drive
                         sdMounted = True
                     except Exception as e:
-                        print_exception(e)
+                        print_exception(e,e, \
+                            e.__traceback__ if hasattr(e,'__traceback__') else None)
 
         elif implementation.name.upper() == "CIRCUITPYTHON":
 
@@ -149,7 +154,8 @@ def do_mount(drive,spiNo):
                         Pydos_hw.SDdrive[sdioNo] = drive
                         sdMounted = True
                     except Exception as e:
-                        print('SD-Card: Fail,', e)
+                        print_exception(e,e, \
+                            e.__traceback__ if hasattr(e,'__traceback__') else None)
             elif spiNo+1 > len(Pydos_hw.CS):
                 print("CS Pin not allocated for Pydos_bcfg SPI interface #",spiNo)
             elif Pydos_hw.SDdrive[spiNo] != None:
@@ -165,7 +171,8 @@ def do_mount(drive,spiNo):
                     Pydos_hw.SDdrive[spiNo] = drive
                     sdMounted = True
                 except Exception as e:
-                    print('SD-Card: Fail,', e)
+                    print_exception(e,e, \
+                        e.__traceback__ if hasattr(e,'__traceback__') else None)
 
         if sdMounted:
             print(drive+" mounted")