multiSSH3 5.52__tar.gz → 5.54__tar.gz

{multissh3-5.52 → multissh3-5.54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: multiSSH3
-Version: 5.52
+Version: 5.54
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan

{multissh3-5.52 → multissh3-5.54}/multiSSH3.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: multiSSH3
-Version: 5.52
+Version: 5.54
 Summary: Run commands on multiple hosts via SSH
 Home-page: https://github.com/yufei-pan/multiSSH3
 Author: Yufei Pan

{multissh3-5.52 → multissh3-5.54}/multiSSH3.py

@@ -54,7 +54,7 @@ except AttributeError:
 		# If neither is available, use a dummy decorator
 		def cache_decorator(func):
 			return func
-version = '5.52'
+version = '5.54'
 VERSION = version
 __version__ = version
 COMMIT_DATE = '2025-03-01'
@@ -491,10 +491,10 @@ def replace_magic_strings(string,keys,value,case_sensitive=False):
 	return string
 
 def pretty_format_table(data, delimiter = '\t',header = None):
-    version = 1.1
+    version = 1.11
     if not data:
         return ''
-    if type(data) == str:
+    if isinstance(data, str):
         data = data.strip('\n').split('\n')
         data = [line.split(delimiter) for line in data]
     elif isinstance(data, dict):
@@ -506,7 +506,7 @@ def pretty_format_table(data, delimiter = '\t',header = None):
         else:
             # it is a dict of lists
             data = [[key] + list(value) for key, value in data.items()]
-    elif type(data) != list:
+    elif not isinstance(data, list):
         data = list(data)
     # format the list into 2d list of list of strings
     if isinstance(data[0], dict):
@@ -521,6 +521,9 @@ def pretty_format_table(data, delimiter = '\t',header = None):
         #col_widths[c] = max(len(row[c]) for row in data)
         # handle ansii escape sequences
         col_widths[c] = max(len(re.sub(r'\x1b\[[0-?]*[ -/]*[@-~]','',row[c])) for row in data)
+    if header:
+        header_widths = [len(re.sub(r'\x1b\[[0-?]*[ -/]*[@-~]', '', col)) for col in header]
+        col_widths = [max(col_widths[i], header_widths[i]) for i in range(num_cols)]
     # Build the row format string
     row_format = ' | '.join('{{:<{}}}'.format(width) for width in col_widths)
     # Print the header
@@ -1235,9 +1238,9 @@ def run_command(host, sem, timeout=60,passwds=None, retry_limit = 5):
 		host.command = replace_magic_strings(host.command,['#PASSWD#','#PASSWORD#'],passwds,case_sensitive=False)
 		host.command = replace_magic_strings(host.command,['#UUID#'],str(host.uuid),case_sensitive=False)
 		formatedCMD = []
-		if host.extraargs and type(host.extraargs) == str:
+		if host.extraargs and isinstance(host.extraargs, str):
 			extraargs = host.extraargs.split()
-		elif host.extraargs and type(host.extraargs) == list:
+		elif host.extraargs and isinstance(host.extraargs, list):
 			extraargs = [str(arg) for arg in host.extraargs]
 		else:
 			extraargs = []
@@ -2374,7 +2377,7 @@ def formHostStr(host) -> str:
 	"""
 	if not host or len(host) == 0:
 		return 'EMPTY_HOSTS'
-	if type(host) is str:
+	if isinstance(host, str):
 		host = set(host.replace(',',' ').replace('\n',' ').replace('\r',' ').replace('\t',' ').replace(';', ' ').replace('|', ' ').replace('/', ' ').replace('&',' ').split())
 	else:
 		host = set(host)
@@ -2426,7 +2429,7 @@ def getStrCommand(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAULT_ONE_O
 						 single_window = DEFAULT_SINGLE_WINDOW,file_sync = False,error_only = DEFAULT_ERROR_ONLY, identity_file = DEFAULT_IDENTITY_FILE,
 						 copy_id = False,
 						 shortend = False):
-	hosts = hosts if type(hosts) == str else frozenset(hosts)
+	hosts = hosts if isinstance(hosts,str) else frozenset(hosts)
 	hostStr = formHostStr(hosts)
 	files = frozenset(files) if files else None
 	argsStr = __formCommandArgStr(oneonone = oneonone, timeout = timeout,password = password,
@@ -2540,10 +2543,10 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 	if not commands:
 		commands = []
 	else:
-		commands = [commands] if type(commands) == str else commands
+		commands = [commands] if isinstance(commands,str) else commands
 		# reformat commands into a list of strings, join the iterables if they are not strings
 		try:
-			commands = [' '.join(command) if not type(command) == str else command for command in commands]
+			commands = [' '.join(command) if not isinstance(command,str) else command for command in commands]
 		except:
 			pass
 			eprint(f"Warning: commands should ideally be a list of strings. Now mssh had failed to convert {commands!r} to a list of strings. Continuing anyway but expect failures.")