p3lib 1.1.110__tar.gz → 1.1.111__tar.gz

{p3lib-1.1.110 → p3lib-1.1.111}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.110
+Version: 1.1.111
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/test_equipment
 License: MIT

{p3lib-1.1.110 → p3lib-1.1.111}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "p3lib"
-version = "1.1.110"
+version = "1.1.111"
 description = "A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output."
 authors = ["Paul Austen <pjaos@gmail.com>"]
 license = "MIT License"

{p3lib-1.1.110 → p3lib-1.1.111}/src/p3lib/helper.py

@@ -383,7 +383,8 @@ def getAbsFile(filename):
                 1 - The startup folder
                 2 - An 'assets' folder in the startup folder
                 3 - An 'assets' folder in the startup parent folder
-                3 - In an 'assets' folder in a python site-packages folder.
+                4 - In a site-packages folder.
+                5 - In an 'assets' folder in a python site-packages folder.
         @param filename The name of the icon file.
         @return The abs path of the file or None if not found."""
     file_found = None
@@ -411,14 +412,19 @@ def getAbsFile(filename):
                 for path in sys.path:
                     if 'site-packages' in path:
                         site_packages_path = path
-                        path3 = os.path.join(site_packages_path, 'assets')
-                        abs_filename = os.path.join(path3, filename)
+                        abs_filename = os.path.join(site_packages_path, filename)
+                        print(f"PJA: abs_filename={abs_filename}, FOUND={os.path.isfile(abs_filename)}")
                         if os.path.isfile(abs_filename):
                             file_found = abs_filename
-                            break
 
-    return file_found
+                        else:
+                            path3 = os.path.join(site_packages_path, 'assets')
+                            abs_filename = os.path.join(path3, filename)
+                            if os.path.isfile(abs_filename):
+                                file_found = abs_filename
+                                break
 
+    return file_found
 
 PYPROJECT_FILE = "pyproject.toml"
 

{p3lib-1.1.110 → p3lib-1.1.111}/src/p3lib/uio.py

@@ -217,22 +217,22 @@ class UIO(object):
                 value = float(response)
             else:
                 value = int(response, radix)
-
+                
             if minValue is not None and value < minValue:
                 self.warn(f"The minimum acceptable value is {minValue}")
-
+                
             if maxValue is not None and value > maxValue:
                 self.warn(f"The mximum acceptable value is {maxValue}")
-
+                
             return value
 
         except ValueError:
             if floatValue:
                 self.warn("%s is not a valid float value." % (response))
-
+                
             else:
                 self.warn("%s is not a valid integer value." % (response))
-
+                
         if allowQuit and response.lower() == 'q':
             return None
 
@@ -424,7 +424,7 @@ class UIO(object):
             #Ignore if se can't resolve address. We don't really syslog want errors to stop the user interface
             except:
                 pass
-
+        
     def showTable(self, table, rowSeparatorChar = "-", colSeparatorChar = "|"):
         """@brief Show the contents of a table to the user.
            @param table This must be a list. Each list element must be a table row (list).
@@ -435,18 +435,18 @@ class UIO(object):
         # Check we have a table to display
         if len(table) == 0:
             raise Exception("No table rows to display")
-
+        
         # Check all rows have the same number of columns in the table
         colCount = len(table[0])
         for row in table:
             if len(row) != colCount:
                 raise Exception(f"{str(row)} column count different from first row ({colCount})")
-
+        
         for row in table:
             for col in row:
                 if not isinstance(col, str):
                     raise Exception(f"Table column is not a string: {col} in {row}")
-
+                
         # Get the max width for each column
         for col in range(0,colCount):
             maxWidth=0
@@ -458,10 +458,10 @@ class UIO(object):
         tableWidth = 1
         for columnWidth in columnWidths:
             tableWidth += columnWidth + 3 # Space each side of the column + a column divider character
-
+                    
         # Add the top line of the table
         self.info(rowSeparatorChar*tableWidth)
-
+               
         # The starting row index
         for rowIndex in range(0, len(table)):
             rowText = colSeparatorChar
@@ -473,7 +473,7 @@ class UIO(object):
             self.info(rowText)
             # Add the row separator line
             self.info(rowSeparatorChar*tableWidth)
-
+            
 class ConsoleMenu(object):
     """@brief Responsible for presenting a list of options to the user on a
               console/terminal interface and allowing the user to select
@@ -508,10 +508,10 @@ class ConsoleMenu(object):
                     selectedMethod()
                 else:
                     selectedMethod(*args)
-
-
-
-
+          
+            
+        
+                
 
 # -------------------------------------------------------------------
 # @brief An implementation to allow syslog messages to be generated.