multiSSH3 6.14__tar.gz → 6.16__tar.gz

{multissh3-6.14 → multissh3-6.16}/PKG-INFO

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

{multissh3-6.14 → multissh3-6.16}/multiSSH3.egg-info/PKG-INFO

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

{multissh3-6.14 → multissh3-6.16}/multiSSH3.py

@@ -30,8 +30,9 @@ import threading
 import time
 import typing
 import uuid
-from collections import Counter, deque, defaultdict
+from collections import Counter, defaultdict, deque
 from itertools import count, product
+from pprint import pformat
 
 __curses_available = False
 __resource_lib_available = False
@@ -84,10 +85,10 @@ except Exception:
 	print('Warning: functools.lru_cache is not available, multiSSH3 will run slower without cache.',file=sys.stderr)
 	def cache_decorator(func):
 		return func
-version = '6.14'
+version = '6.16'
 VERSION = version
 __version__ = version
-COMMIT_DATE = '2026-03-05'
+COMMIT_DATE = '2026-03-16'
 
 CONFIG_FILE_CHAIN = ['./multiSSH3.config.json',
 					 '~/multiSSH3.config.json',
@@ -278,14 +279,9 @@ class Host:
 	def __iter__(self):
 		return zip(['name', 'command', 'returncode', 'stdout', 'stderr'], [self.name, self.command, self.returncode, self.stdout, self.stderr])
 	def __repr__(self):
-		# return the complete data structure
-		return f"Host(name={self.name}, command={self.command}, returncode={self.returncode}, stdout={self.stdout}, stderr={self.stderr}, \
-output={self.output}, lineNumToPrintSet={self.lineNumToPrintSet}, files={self.files}, ipmi={self.ipmi}, \
-interface_ip_prefix={self.interface_ip_prefix}, scp={self.scp}, gatherMode={self.gatherMode}, \
-extraargs={self.extraargs}, resolvedName={self.resolvedName}, i={self.i}, uuid={self.uuid}), \
-identity_file={self.identity_file}, ip={self.ip}, current_color_pair={self.current_color_pair}"
+		return f"Host(\n{pformat(self.__dict__)}\n)"
 	def __str__(self):
-		return f"Host(name={self.name}, command={self.command}, returncode={self.returncode}, stdout={self.stdout}, stderr={self.stderr})"
+		return f"Host(\n{pformat(dict(self))}\n)"
 	def get_output_hash(self):
 		return hash((
 			self.command,
@@ -3155,7 +3151,7 @@ def form_merge_groups(hostnames_by_line_bag_len, sorted_hostnames_by_line_bag_le
 				# if other_line_bag_len < line_bag_len:
 				# 	continue
 				for other_hostname in hostnames_by_line_bag_len.get(other_line_bag_len, set()).copy():
-					if can_merge(this_line_bag, line_bag_by_hostname[other_hostname], diff_display_threshold):
+					if other_hostname in line_bag_by_hostname and can_merge(this_line_bag, line_bag_by_hostname[other_hostname], diff_display_threshold):
 						merge_group.append(other_hostname)
 						hostnames_by_line_bag_len[other_line_bag_len].remove(other_hostname)
 						if not hostnames_by_line_bag_len[other_line_bag_len]: