p3lib 1.1.78__tar.gz → 1.1.80__tar.gz

{p3lib-1.1.78 → p3lib-1.1.80}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.78
+Version: 1.1.80
 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/p3lib
 Author: Paul Austen

{p3lib-1.1.78 → p3lib-1.1.80}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = p3lib
-version = 1.1.78
+version = 1.1.80
 author = Paul Austen
 author_email = pausten.os@gmail.com
 description = A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.

{p3lib-1.1.78 → p3lib-1.1.80}/src/p3lib/bokeh_auth.py

@@ -321,9 +321,9 @@ class CredentialsManager(object):
         username = self._uio.getInput('Enter the username: ')
         password = self._uio.getInput('Enter the password: ')
         if self.credentialsHasher.verify(username, password):
-            self._uio.info(f"The username and password match.")
+            self._uio.info("The username and password match.")
         else:
-            self._uio.error(f"The username and password do not match.")
+            self._uio.error("The username and password do not match.")
 
     def _showUsernames(self):
         """@brief Show the user a list of the usernames stored."""

{p3lib-1.1.78 → p3lib-1.1.80}/src/p3lib/boot_manager.py

@@ -15,24 +15,22 @@ class BootManager(object):
 
     LINUX_OS_NAME = "Linux"
 
-    def __init__(self, uio=None, allowRootUser=False):
+    def __init__(self, uio=None, allowRootUser=True, ensureRootUser=False):
         """@brief Constructor
            @param uio A UIO instance to display user output. If unset then no output
                   is displayed to user.
            @param allowRootUser If True then allow root user to to auto start
-                  programs. We do not do this by default because often a programs
-                  configuration is stored in the users home path. E.G a config
-                  file in ~/.<configfilename> or ~/.config/<configfolder or filename>.
-                  If a program is started as root user then this config may not
-                  be present in the /root folder and so when the program is started
-                  it's config will not be found. If a program stores no config in
-                  the home folder then this is not an issue."""
+                  programs. Note that as the BootManager is responsible for 
+                  ensuring programs are started up when a machine boots up 
+                  the installed program should be installed for the root 
+                  user on Linux systems.
+           @param ensureRootUser If True the current user must be root user (Linux systems)."""
         self._uio = uio
         self._allowRootUser=allowRootUser
         self._osName = platform.system()
         self._platformBootManager = None
         if self._osName == BootManager.LINUX_OS_NAME:
-            self._platformBootManager = LinuxBootManager(uio, self._allowRootUser)
+            self._platformBootManager = LinuxBootManager(uio, self._allowRootUser, ensureRootUser)
         else:
             raise Exception("{} is an unsupported OS.".format(self._osName) )
 
@@ -100,16 +98,20 @@ class LinuxBootManager(object):
             raise Exception(f"{serviceFolder} folder not found.")
         return serviceFolder
 
-    def __init__(self, uio, allowRootUser):
+    def __init__(self, uio, allowRootUser, ensureRootUser):
         """@brief Constructor
            @param uio A UIO instance to display user output. If unset then no output is displayed to user.
-           @param allowRootUser If True then allow root user to to auto start programs."""
+           @param allowRootUser If True then allow root user to to auto start programs.
+           @param ensureRootUser If True the current user must be root user."""
         self._uio = uio
         self._logFile = None
         self._allowRootUser=allowRootUser
         self._info("OS: {}".format(platform.system()) )
         self._rootMode = False # If True run as root, else False.
         self._systemCtlBin = LinuxBootManager.GetSystemCTLBin()
+        if ensureRootUser and os.geteuid() != 0:
+            self._fatalError(self.__class__.__name__ + ": Not root user. Ensure that you are root user and try again.")
+
         if os.geteuid() == 0:
             if not allowRootUser:
                 self._fatalError(self.__class__.__name__ + f": You are running as root user but allowRootUser={allowRootUser}.")

{p3lib-1.1.78 → p3lib-1.1.80}/src/p3lib/table_plot.py

@@ -18,7 +18,6 @@ from    bokeh.layouts import gridplot, row, column
 from    bokeh.plotting import figure, ColumnDataSource
 from    bokeh.palettes import Category20
 from    bokeh.models import HoverTool, Div
-from    bokeh.models import DatetimeTickFormatter
 from    bokeh.models.widgets.buttons import Button
 from    bokeh.models.widgets import TextInput
 from    bokeh.plotting import output_file, save

{p3lib-1.1.78 → p3lib-1.1.80}/src/p3lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.78
+Version: 1.1.80
 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/p3lib
 Author: Paul Austen