p3lib 1.1.109__py2.py3-none-any.whl → 1.1.110__py2.py3-none-any.whl

p3lib/helper.py

@@ -273,7 +273,7 @@ def getHomePath():
     if platform.system() == 'Linux' and os.geteuid() == 0:
         # Fix for os.environ["HOME"] returning /home/root sometimes.
         return '/root/'
-    
+
     elif "HOME" in os.environ:
         return os.environ["HOME"]
 
@@ -417,4 +417,26 @@ def getAbsFile(filename):
                             file_found = abs_filename
                             break
 
-    return file_found
+    return file_found
+
+
+PYPROJECT_FILE = "pyproject.toml"
+
+def getProgramVersion():
+    """@return The program/package version. This comes from the pyproject.toml file.
+               If this file is not found an exception is thrown.  """
+    poetryConfigFile = getAbsFile(PYPROJECT_FILE)
+    programVersion = None
+    with open(poetryConfigFile, 'r') as fd:
+        lines = fd.readlines()
+        for line in lines:
+            line=line.strip("\r\n")
+            if line.startswith('version'):
+                elems = line.split("=")
+                if len(elems) == 2:
+                    programVersion = elems[1].strip('" ')
+                    break
+    if programVersion is None:
+        raise Exception(f"Failed to extract program version from '{line}' line of {poetryConfigFile} file.")
+    return programVersion
+

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.

{p3lib-1.1.109.dist-info → p3lib-1.1.110.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.109
+Version: 1.1.110
 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.109.dist-info → p3lib-1.1.110.dist-info}/RECORD

@@ -7,7 +7,7 @@ p3lib/conduit.py,sha256=jPkjdtyCx2I6SFqcEo8y2g7rgnZ-jNY7oCuYIETzT5Q,6046
 p3lib/database_if.py,sha256=XKu1w3zftGbj4Rh54wrWJnoCtqHkhCzJUPN2S70XIKg,11915
 p3lib/file_io.py,sha256=A7_GKYPlmjRjq6U1YuWhmB0OhLhNm6cWQfQX8qfgYTk,5041
 p3lib/gnome_desktop_app.py,sha256=zl9SKRBV8ipVg2faCs_gbAr8c42J1N_pntbFGG2BMiE,6694
-p3lib/helper.py,sha256=RHA0T1ckG3wLgTXgI_1mrtbzvMBaIwd8ow7x9orXUfA,13730
+p3lib/helper.py,sha256=9Om9dzUD3KrLo7MJA_ma_jyPOfcBJBFX3d8PvuZODoc,14528
 p3lib/json_networking.py,sha256=6u4s1SmypjTYPnSxHP712OgQ3ZJaxOqIkgHQ1J7Qews,9738
 p3lib/login.html,sha256=DADTJGuvWQ-LTO4X6SaFdqK7JMW03DAa3lRieGD0d6g,2748
 p3lib/mqtt_rpc.py,sha256=6LmFA1kR4HSJs9eWbOJORRHNY01L_lHWjvtE2fmY8P8,10511
@@ -17,8 +17,8 @@ p3lib/ngt.py,sha256=Y4HsSiaBEYi7OFWkqkDDJende_yyxsvIjUremfArXgA,39204
 p3lib/pconfig.py,sha256=k1WHvmHzOfmkSbP7CrFyT1iTwn5_UROQjk6gltdh7bk,37280
 p3lib/ssh.py,sha256=OyoAQ_h1L2RfkjTAChDrvLFfl4Fe_gBNdX5rvK-wKiw,42125
 p3lib/table_plot.py,sha256=RPncwVlGUkkx5Fw0dHQedXo0TSPlTi__VrJBDzaMsuI,32116
-p3lib/uio.py,sha256=Aaxc99XiE3d2f9vLjaN-bZsckoNxay5t0ujdK6PXGrw,23265
-p3lib-1.1.109.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
-p3lib-1.1.109.dist-info/METADATA,sha256=kOt7WY42n-MJAlJujZXyFJo9hkmBOe48SHKEgOU5p84,1337
-p3lib-1.1.109.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
-p3lib-1.1.109.dist-info/RECORD,,
+p3lib/uio.py,sha256=BAvzE3LFivaP6dlgjle04RYZ-YIWxXDE01Bfuzrz-Dc,23052
+p3lib-1.1.110.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
+p3lib-1.1.110.dist-info/METADATA,sha256=OMGf2ConUm--OzGAg0hX8gx8F0Gf2LviWOd_YpGin5c,1337
+p3lib-1.1.110.dist-info/WHEEL,sha256=IrRNNNJ-uuL1ggO5qMvT1GGhQVdQU54d6ZpYqEZfEWo,92
+p3lib-1.1.110.dist-info/RECORD,,