TSVZ 3.23__py3-none-any.whl → 3.24__py3-none-any.whl

TSVZ.py

@@ -22,7 +22,7 @@ if os.name == 'nt':
 elif os.name == 'posix':
     import fcntl
 
-version = '3.23'
+version = '3.24'
 __version__ = version
 author = 'pan@zopyr.us'
 
@@ -128,6 +128,7 @@ def pretty_format_table(data, delimiter = DEFAULT_DELIMITER,header = None):
 def format_bytes(size, use_1024_bytes=None, to_int=False, to_str=False,str_format='.2f'):
 	"""
 	Format the size in bytes to a human-readable format or vice versa.
+	From hpcp: https://github.com/yufei-pan/hpcp
 
 	Args:
 		size (int or str): The size in bytes or a string representation of the size.
@@ -140,10 +141,16 @@ def format_bytes(size, use_1024_bytes=None, to_int=False, to_str=False,str_forma
 		int or str: The formatted size based on the provided arguments.
 
 	Examples:
-		>>> format_bytes(1500)
-		'1.50 KB'
+		>>> format_bytes(1500, use_1024_bytes=False)
+		'1.50 K'
 		>>> format_bytes('1.5 GiB', to_int=True)
 		1610612736
+		>>> format_bytes('1.5 GiB', to_str=True)
+		'1.50 Gi'
+		>>> format_bytes(1610612736, use_1024_bytes=True, to_str=True)
+		'1.50 Gi'
+		>>> format_bytes(1610612736, use_1024_bytes=False, to_str=True)
+		'1.61 G'
 	"""
 	if to_int or isinstance(size, str):
 		if isinstance(size, int):
@@ -152,6 +159,8 @@ def format_bytes(size, use_1024_bytes=None, to_int=False, to_str=False,str_forma
 			# Use regular expression to split the numeric part from the unit, handling optional whitespace
 			match = re.match(r"(\d+(\.\d+)?)\s*([a-zA-Z]*)", size)
 			if not match:
+				if to_str:
+					return size
 				print("Invalid size format. Expected format: 'number [unit]', e.g., '1.5 GiB' or '1.5GiB'")
 				print(f"Got: {size}")
 				return 0
@@ -171,8 +180,12 @@ def format_bytes(size, use_1024_bytes=None, to_int=False, to_str=False,str_forma
 				power = 10**3
 			unit_labels = {'': 0, 'k': 1, 'm': 2, 'g': 3, 't': 4, 'p': 5}
 			if unit not in unit_labels:
+				if to_str:
+					return size
 				print(f"Invalid unit '{unit}'. Expected one of {list(unit_labels.keys())}")
 				return 0
+			if to_str:
+				return format_bytes(size=int(number * (power ** unit_labels[unit])), use_1024_bytes=use_1024_bytes, to_str=True, str_format=str_format)
 			# Calculate the bytes
 			return int(number * (power ** unit_labels[unit]))
 		else:
@@ -183,8 +196,8 @@ def format_bytes(size, use_1024_bytes=None, to_int=False, to_str=False,str_forma
 	elif to_str or isinstance(size, int) or isinstance(size, float):
 		if isinstance(size, str):
 			try:
-				size = size.lower().strip().rstrip('b')
-				size = float(size)
+				size = size.rstrip('B').rstrip('b')
+				size = float(size.lower().strip())
 			except Exception as e:
 				return size
 		# size is in bytes
@@ -195,7 +208,7 @@ def format_bytes(size, use_1024_bytes=None, to_int=False, to_str=False,str_forma
 			while size > power:
 				size /= power
 				n += 1
-			return f"{size:{str_format}} {power_labels[n]}"
+			return f"{size:{str_format}}{' '}{power_labels[n]}"
 		else:
 			power = 10**3
 			n = 0
@@ -203,7 +216,7 @@ def format_bytes(size, use_1024_bytes=None, to_int=False, to_str=False,str_forma
 			while size > power:
 				size /= power
 				n += 1
-			return f"{size:{str_format}} {power_labels[n]}"
+			return f"{size:{str_format}}{' '}{power_labels[n]}"
 	else:
 		try:
 			return format_bytes(float(size), use_1024_bytes)

{tsvz-3.23.dist-info → tsvz-3.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: TSVZ
-Version: 3.23
+Version: 3.24
 Summary: An simple in memory wrapper around a TSV file to function as a database
 Home-page: https://github.com/yufei-pan/TSVZ
 Author: Yufei Pan

tsvz-3.24.dist-info/RECORD

@@ -0,0 +1,6 @@
+TSVZ.py,sha256=PPylrxbtSuTUVlyuLj1tfD3DpLasLyrI0oRrCgbyr50,69364
+tsvz-3.24.dist-info/METADATA,sha256=SrxVDXR15_46qKjCRRZIdkEt0HqMAgJIeKjW48y6szk,1826
+tsvz-3.24.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
+tsvz-3.24.dist-info/entry_points.txt,sha256=WeXidyV5yKCRLaVsnAY35xGa08QgytOfvr1CK9aescI,60
+tsvz-3.24.dist-info/top_level.txt,sha256=OPx4LvOpaYykaos7oL_jGaObSWXxLzhHiWLuz-K147g,5
+tsvz-3.24.dist-info/RECORD,,

{tsvz-3.23.dist-info → tsvz-3.24.dist-info}/WHEEL

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

tsvz-3.23.dist-info/RECORD

@@ -1,6 +0,0 @@
-TSVZ.py,sha256=PG3VoplnSdmgvm2vuor_nPXLSlwQ-B9ZBN-psDfefK0,68850
-tsvz-3.23.dist-info/METADATA,sha256=kK-NSB38DG_p6rzFmiu2qcijSOb1U2xI-SkglShvxDk,1826
-tsvz-3.23.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-tsvz-3.23.dist-info/entry_points.txt,sha256=WeXidyV5yKCRLaVsnAY35xGa08QgytOfvr1CK9aescI,60
-tsvz-3.23.dist-info/top_level.txt,sha256=OPx4LvOpaYykaos7oL_jGaObSWXxLzhHiWLuz-K147g,5
-tsvz-3.23.dist-info/RECORD,,