p3lib 1.1.71__py3-none-any.whl → 1.1.73__py3-none-any.whl

p3lib/database_if.py

@@ -154,7 +154,7 @@ class DatabaseIF(object):
 
     def connectNoDB(self):
         """@brief connect to the database server."""
-        self._info("Connecting to {}:{}".format(self._dbConfig.serverAddress, self._dbConfig.serverPort))
+        self._info("Connecting to database server @ {}:{}".format(self._dbConfig.serverAddress, self._dbConfig.serverPort))
         self._dbCon = mysqldb.Connection(host=self._dbConfig.serverAddress,\
                                                 port=self._dbConfig.serverPort,\
                                                 user=self._dbConfig.username,\

p3lib/ssh.py

@@ -122,6 +122,7 @@ class SSH(object):
     PRIVATE_KEY_FILE_LIST               = ["id_rsa", "id_dsa", 'id_ecdsa']
     PUBLIC_KEY_FILE_LIST                = ["id_rsa.pub", "id_dsa.pub", 'id_ecdsa.pub']
     LOCAL_SSH_CONFIG_PATH               = os.path.join(os.path.expanduser("~"), ".ssh")
+    DEFAULT_REMOTE_SSH_CONFIG_FOLDER    = "~/.ssh"
     DEFAULT_REMOTE_SSH_AUTH_KEYS_FILE   = "~/.ssh/authorized_keys"
     DROPBEAR_DIR                        = "/etc/dropbear"
     DROPBEAR_AUTH_KEYS_FILE             = "%s/authorized_keys" % (DROPBEAR_DIR)
@@ -520,8 +521,17 @@ class SSH(object):
 
         cmd = "test -d %s" % (SSH.DROPBEAR_DIR)
         rc, stdoutLines, stderrLines = self.runCmd(cmd, throwError=False)
+        # If the ssh server uses dropbear
         if rc == 0:
             authKeysFile = SSH.DROPBEAR_AUTH_KEYS_FILE
+        else:
+            # Check for the users ssh config folder
+            cmd = "test -d %s" % (SSH.DEFAULT_REMOTE_SSH_CONFIG_FOLDER)
+            rc, stdoutLines, stderrLines = self.runCmd(cmd, throwError=False)
+            if rc != 0:
+                # If the remote ssh config folder does not exist, create it
+                cmd = f"mkdir {SSH.DEFAULT_REMOTE_SSH_CONFIG_FOLDER}"
+                rc, stdoutLines, stderrLines = self.runCmd(cmd, throwError=True)
 
         return authKeysFile
 

{p3lib-1.1.71.dist-info → p3lib-1.1.73.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.71
+Version: 1.1.73
 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
@@ -12,8 +12,8 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: paramiko >=2.9.3
-Requires-Dist: pillow >=9.2.0
+Requires-Dist: paramiko>=2.9.3
+Requires-Dist: pillow>=9.2.0
 
 # A Python3 library
 A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.

{p3lib-1.1.71.dist-info → p3lib-1.1.73.dist-info}/RECORD

@@ -4,18 +4,18 @@ p3lib/bokeh_auth.py,sha256=XqdCLOalHL3dkyrMPqQoVQBSziVnqlfjB9YAWhZUd_U,14769
 p3lib/bokeh_gui.py,sha256=MNapLctSncZ9YyKGzNcUICMwpI5_h7a7bH3QdMd2UxI,40393
 p3lib/boot_manager.py,sha256=-kbfYbFpO-ktKv_heUgYdvvIQrntfCQ7pBcPWqS3C0s,12551
 p3lib/conduit.py,sha256=jPkjdtyCx2I6SFqcEo8y2g7rgnZ-jNY7oCuYIETzT5Q,6046
-p3lib/database_if.py,sha256=mgTdSeCTQs1V10E7KuyK3xRkdaU3RXrqYpMQvosrA_M,11897
+p3lib/database_if.py,sha256=XKu1w3zftGbj4Rh54wrWJnoCtqHkhCzJUPN2S70XIKg,11915
 p3lib/helper.py,sha256=-B63_ncfchMwXrvyVcnj9sxwGnMJ3ASmLmpoYa4tBmM,11862
 p3lib/json_networking.py,sha256=6u4s1SmypjTYPnSxHP712OgQ3ZJaxOqIkgHQ1J7Qews,9738
 p3lib/mqtt_rpc.py,sha256=6LmFA1kR4HSJs9eWbOJORRHNY01L_lHWjvtE2fmY8P8,10511
 p3lib/netif.py,sha256=3QV5OGdHhELIf4MBj6mx5MNCtVeZ7JXoNEkeu4KzCaE,9796
 p3lib/netplotly.py,sha256=PMDx-w1jtRVW6Od5u_kuKbBxNpTS_Y88mMF60puMxLM,9363
 p3lib/pconfig.py,sha256=_ri9w3aauHXZp8u2YLYHBVroFR_iCqaTCwj_MRa3rHo,30153
-p3lib/ssh.py,sha256=-w_2oQWZaIABanF1lk8fRyMLkJK231Bvy11StgdYqJg,38951
+p3lib/ssh.py,sha256=JiO9MY98zf3uqbonygJi_F9X0eAAgHAINCTeBuYXpCY,39511
 p3lib/table_plot.py,sha256=dRPZ9rFpwE9Dpyqrvbm5t2spVaPSHrx_B7KvfWVND3g,32166
 p3lib/uio.py,sha256=hMarPnYXnqVF23HUIeDfzREo7TMdBjrupXMY_ffuCbI,23133
-p3lib-1.1.71.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
-p3lib-1.1.71.dist-info/METADATA,sha256=brK06I1P_AVSTY4bFV2VGf9J8flUWVrK6ycf18_22VM,920
-p3lib-1.1.71.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-p3lib-1.1.71.dist-info/top_level.txt,sha256=SDCpXYh-19yCFp4Z8ZK4B-3J4NvTCJElZ42NPgcR6-U,6
-p3lib-1.1.71.dist-info/RECORD,,
+p3lib-1.1.73.dist-info/LICENSE,sha256=igqTy5u0kVWM1n-NUZMvAlinY6lVjAXKoag0okkS8V8,1067
+p3lib-1.1.73.dist-info/METADATA,sha256=W0G4eAqz_wdHdICMxWEQQoGsvonKdTIvZ5k8VuP7J6U,918
+p3lib-1.1.73.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+p3lib-1.1.73.dist-info/top_level.txt,sha256=SDCpXYh-19yCFp4Z8ZK4B-3J4NvTCJElZ42NPgcR6-U,6
+p3lib-1.1.73.dist-info/RECORD,,

{p3lib-1.1.71.dist-info → p3lib-1.1.73.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (74.1.2)
 Root-Is-Purelib: true
 Tag: py3-none-any