Syntax error in utilities.py may be the reason for failed import. Cor…

…reted
esp8266 · gneiss15 · Aug 2, 2021 · Aug 9, 2021 · Aug 13, 2021 · Aug 13, 2021
commit 43f9e21461215fb95b5e72472c4b016c84e076d4
diff --git a/tools/netUploadGn.py b/tools/netUploadGn.py
@@ -9,8 +9,8 @@
 try:
     sys.path.insert( 0, ToolsDir ) # ToolsDir
     from utillities import * # If this fails, we can't continue and will bomb below
-except Exception:
-    sys.stderr.write( '\nutillities.py not found next to this %s tool.\n' % __file__  )
+except Exception as e:
+    sys.stderr.write( '\nImport of utillities.py failed.\n...Is it not next to this %s tool?\n...Exception was: %s\n' % ( __file__, e )  )
     sys.exit( 2 )
 
 try:

diff --git a/tools/postbuild.py b/tools/postbuild.py
@@ -4,20 +4,12 @@
 import os
 import sys
 ToolsDir = os.path.dirname( os.path.realpath( __file__ ) ).replace( '\\', '/' ) + "/" # convert to UNIX format
-sys.stderr.write( '\nDebug for failed check in Pull-Request:\n' )
-sys.stderr.write( '...ToolsDir: %s\n' % ToolsDir )
-sys.stderr.write( '...sys.path (before insert): %s\n' % ", ".join( sys.path ) )
-sys.stderr.write( '...os.path.exists( ToolsDir/utillities.py ): %s\n"' % ( "Yes" if os.path.exists( ToolsDir + "utillities.py" ) else "No" ) )
 try:
     sys.path.insert( 0, ToolsDir ) # ToolsDir
-    sys.stderr.write( '...sys.path (after insert): %s\n' % ", ".join( sys.path ) )
     from utillities import * # If this fails, we can't continue and will bomb below
-except Exception:
-    try:
-        from .utillities import * # If this fails, we can't continue and will bomb below
-    except Exception:
-        sys.stderr.write( '\nutillities.py not found next to this %s tool.\n' % __file__  )
-        sys.exit( 2 )
+except Exception as e:
+    sys.stderr.write( '\nImport of utillities.py failed.\n...Is it not next to this %s tool?\n...Exception was: %s\n' % ( __file__, e )  )
+    sys.exit( 2 )
 
 def parse_args( argsIn ):
     parser = argparse.ArgumentParser( description = 'PostBuild for ESP8288' )

diff --git a/tools/uploadGn.py b/tools/uploadGn.py
@@ -9,8 +9,8 @@
 try:
     sys.path.insert( 0, ToolsDir ) # ToolsDir
     from utillities import * # If this fails, we can't continue and will bomb below
-except Exception:
-    sys.stderr.write( '\nutillities.py not found next to this %s tool.\n' % __file__  )
+except Exception as e:
+    sys.stderr.write( '\nImport of utillities.py failed.\n...Is it not next to this %s tool?\n...Exception was: %s\n' % ( __file__, e )  )
     sys.exit( 2 )
 import tempfile
 from pathlib import Path

diff --git a/tools/utillities.py b/tools/utillities.py
@@ -49,7 +49,7 @@ def Which( prg, dir = None ):
         Takes care of OS, on Windows searches for <prg>.exe instead of <prg>.
         if <dir> is given prefers prg inside this dir over others"""
     if platform.system() == "Windows":
-      prg = "%s.exe" % prg
+        prg = "%s.exe" % prg
     res = None
     if dir is not None:
         res = Which_Chdir_( prg, dir )
@@ -62,23 +62,14 @@ def CopyToDir( name, ext, dstDir ):
     fileName = "%s.%s" % ( name, ext )
     srcPath = os.path.abspath( fileName )
     if not os.path.exists( srcPath ):
-      return []
+        return []
     shutil.copyfile( srcPath, os.path.join( dstDir, fileName ) )
     return [ fileName ]
 
 def IntValFromStr( strVal ):
     """ Convert string into integer, can be used with decimal value '123' or hex '0xabc'. """
     return int( strVal.strip(), 0 )
 
-def CountFilesInDir( dataDir ):
-    fileCount = 0
-    for root, dir, files in os.walk( dataDir ):
-        for file in files:
-            #!? Why Ony count files without '.' ??
-            if file[ 0 ] != ".":
-                fileCount += 1
-    return fileCount
-
 def RemoveIno( path ):
     """ Returns the given path with extension ".ino" removed (if exist) """
     if path[ -4: ] == ".ino":
@@ -87,10 +78,10 @@ def RemoveIno( path ):
 
 def ConfirmDialog( title, text ):
     try:
-      import tkinter
-      from tkinter import messagebox
+        import tkinter
+        from tkinter import messagebox
     except:
-        raise ProcessError( "tkinter not available.\nPlease install it with:\npip3 install tkinter\n" ))
+        raise ProcessError( "tkinter not available.\nPlease install it with:\npip3 install tkinter\n" )
     rootWin = tkinter.Tk() # Create the object
     rootWin.overrideredirect( 1 ) # Avoid it appearing and then disappearing quickly
     #rootWin.iconbitmap("PythonIcon.ico") # Set an icon (this is optional - must be in a .ico format)