TSVZ 4.7__tar.gz → 4.8__tar.gz

{tsvz-4.7 → tsvz-4.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TSVZ
-Version: 4.7
+Version: 4.8
 Summary: Key-value store kept in a TSV / CSV / NSV / PSV file, with tsvz-spec-v1 support
 Home-page: https://github.com/yufei-pan/TSVZ
 Author: Yufei Pan
@@ -34,7 +34,7 @@ key-value store in a delimiter-separated text file**. The first column of each
 row is the key; the file behaves like an ordered dictionary that is persisted to
 disk as you change it.
 
-**Version 4.7**, Python **3.6+**, one self-contained module (`TSVZ.py`): drop it
+**Version 4.8**, Python **3.6+**, one self-contained module (`TSVZ.py`): drop it
 next to your code and `import TSVZ`, or install it.
 
 ```bash
@@ -258,7 +258,7 @@ and `-d=,`, except the ones C5 and C9 list.
 | C3 | `read` and `scrub` of a missing store exit 1 with a message (3.39: exit 0, and `read` printed "File not found" on stdout). |
 | C4 | `delete` deletes every KEY it is given (3.39: only the first). |
 | C5 | `append` or `delete` without a KEY, or with an empty KEY, is a usage error with exit 2 (3.39 wrote an empty line). |
-| C6 | A `clear` or `scrub` that writes nothing (one part of a multi-part store, a store that kept changing) exits 1. |
+| C6 | A `clear` or `scrub` that writes nothing (one part of a multi-part store, a store that kept changing, a part that declares a spec version newer than 1, per spec §19.4 and §19.8) exits 1. |
 | C7 | `-c/--header`, `--defaults`, `-s/--strict` and `-f/--force` are undocumented aliases of the `--x-` options. `--x-header` and `--x-defaults` keep non-ASCII text. |
 | C8 | Usage errors print tsvz's own message, exit 2; the `-h` text is new. |
 | C9 | Arguments after STORE for `read`, `clear` and `scrub` are a usage error, exit 2 (3.39 ignored them, so `clear junk` cleared the file). |

{tsvz-4.7 → tsvz-4.8}/README.md

@@ -7,7 +7,7 @@ key-value store in a delimiter-separated text file**. The first column of each
 row is the key; the file behaves like an ordered dictionary that is persisted to
 disk as you change it.
 
-**Version 4.7**, Python **3.6+**, one self-contained module (`TSVZ.py`): drop it
+**Version 4.8**, Python **3.6+**, one self-contained module (`TSVZ.py`): drop it
 next to your code and `import TSVZ`, or install it.
 
 ```bash
@@ -231,7 +231,7 @@ and `-d=,`, except the ones C5 and C9 list.
 | C3 | `read` and `scrub` of a missing store exit 1 with a message (3.39: exit 0, and `read` printed "File not found" on stdout). |
 | C4 | `delete` deletes every KEY it is given (3.39: only the first). |
 | C5 | `append` or `delete` without a KEY, or with an empty KEY, is a usage error with exit 2 (3.39 wrote an empty line). |
-| C6 | A `clear` or `scrub` that writes nothing (one part of a multi-part store, a store that kept changing) exits 1. |
+| C6 | A `clear` or `scrub` that writes nothing (one part of a multi-part store, a store that kept changing, a part that declares a spec version newer than 1, per spec §19.4 and §19.8) exits 1. |
 | C7 | `-c/--header`, `--defaults`, `-s/--strict` and `-f/--force` are undocumented aliases of the `--x-` options. `--x-header` and `--x-defaults` keep non-ASCII text. |
 | C8 | Usage errors print tsvz's own message, exit 2; the `-h` text is new. |
 | C9 | Arguments after STORE for `read`, `clear` and `scrub` are a usage error, exit 2 (3.39 ignored them, so `clear junk` cleared the file). |

{tsvz-4.7 → tsvz-4.8}/TSVZ.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: TSVZ
-Version: 4.7
+Version: 4.8
 Summary: Key-value store kept in a TSV / CSV / NSV / PSV file, with tsvz-spec-v1 support
 Home-page: https://github.com/yufei-pan/TSVZ
 Author: Yufei Pan
@@ -34,7 +34,7 @@ key-value store in a delimiter-separated text file**. The first column of each
 row is the key; the file behaves like an ordered dictionary that is persisted to
 disk as you change it.
 
-**Version 4.7**, Python **3.6+**, one self-contained module (`TSVZ.py`): drop it
+**Version 4.8**, Python **3.6+**, one self-contained module (`TSVZ.py`): drop it
 next to your code and `import TSVZ`, or install it.
 
 ```bash
@@ -258,7 +258,7 @@ and `-d=,`, except the ones C5 and C9 list.
 | C3 | `read` and `scrub` of a missing store exit 1 with a message (3.39: exit 0, and `read` printed "File not found" on stdout). |
 | C4 | `delete` deletes every KEY it is given (3.39: only the first). |
 | C5 | `append` or `delete` without a KEY, or with an empty KEY, is a usage error with exit 2 (3.39 wrote an empty line). |
-| C6 | A `clear` or `scrub` that writes nothing (one part of a multi-part store, a store that kept changing) exits 1. |
+| C6 | A `clear` or `scrub` that writes nothing (one part of a multi-part store, a store that kept changing, a part that declares a spec version newer than 1, per spec §19.4 and §19.8) exits 1. |
 | C7 | `-c/--header`, `--defaults`, `-s/--strict` and `-f/--force` are undocumented aliases of the `--x-` options. `--x-header` and `--x-defaults` keep non-ASCII text. |
 | C8 | Usage errors print tsvz's own message, exit 2; the `-h` text is new. |
 | C9 | Arguments after STORE for `read`, `clear` and `scrub` are a usage error, exit 2 (3.39 ignored them, so `clear junk` cleared the file). |

{tsvz-4.7 → tsvz-4.8}/TSVZ.py

@@ -40,10 +40,10 @@ if os.name == 'nt':
 elif os.name == 'posix':
 	import fcntl
 
-version = '4.7'
+version = '4.8'
 __version__ = version
 author = 'pan@zopyr.us'
-COMMIT_DATE = '2026-10-13'
+COMMIT_DATE = '2026-10-14'
 
 DEFAULT_DELIMITER = '\t'
 DEFAULTS_INDICATOR_KEY = '#_defaults_#'
@@ -1608,7 +1608,7 @@ _MARKER_RE = re.compile(r'^#_[A-Za-z0-9_-]+_#$')
 #: What a lookup gets for a key that is not live (spec §20.2.7: then the stripped key is tried).
 _NO_ROW = object()
 _CHECKSUM_RE = re.compile(r'^#_checksum_([A-Za-z0-9_-]+)_#$', re.IGNORECASE)
-_ASCII_DIGITS_RE = re.compile(r'^[0-9]+$')
+_ASCII_DIGITS_RE = re.compile(r'^[0-9]+\Z')  # \Z: '$' would also match before a final newline
 _SPEC_DECODE_RE = re.compile(r'<(?:sep|LF|CR|NUL|lt|#)>')
 _SPEC_TOKENS = {'<LF>': '\n', '<CR>': '\r', '<NUL>': '\0', '<lt>': '<', '<#>': '#'}
 _RowState = namedtuple('_RowState', 'defaults strip fillEmpty')
@@ -1742,6 +1742,7 @@ class _SpecState(object):
 
 	def __init__(self, defaults=None):
 		self.version = 1
+		self.newestVersion = 1  # the highest version a #_version_# line declared (spec §19.4, §19.8)
 		self.defaults = list(defaults) if defaults and len(defaults) > 1 else [DEFAULTS_INDICATOR_KEY]
 		self.strip = True
 		self.fillEmpty = False
@@ -1786,16 +1787,17 @@ def _specApplyMarker(state, keyLower, values, reporter, where):
 		else:
 			number = 0
 			if _ASCII_DIGITS_RE.match(value):
-				try:
-					number = int(value)
-				except ValueError:  # more digits than int() converts (Python 3.11+ limit)
-					pass
+				digits = value.lstrip('0') or '0'
+				# int() refuses very long values (Python 3.11+); any such value is above every implemented version.
+				number = int(digits) if len(digits) <= 64 else MAX_SPEC_VERSION + 1
 			if number < 1:
 				reporter.note('bad-marker', where, 'ignored #_version_# with invalid value {!r}'.format(value))
 				return False
 			if number > MAX_SPEC_VERSION:
-				reporter.note('newer-version', where, 'declares spec version {}; read as version {}'.format(value, MAX_SPEC_VERSION))
+				shown = value if len(value) <= 20 else '{}… ({} digits)'.format(value[:20], len(value))
+				reporter.note('newer-version', where, 'declares spec version {}; read as version {}'.format(shown, MAX_SPEC_VERSION))
 			state.version = number
+			state.newestVersion = max(state.newestVersion, number)
 	elif keyLower in _BOOL_MARKERS:
 		attr, default = _BOOL_MARKERS[keyLower]
 		if not value:
@@ -3040,7 +3042,8 @@ def _specClearTabularFile(fileName, teeLogger=None, header='', verifyHeader=Fals
 	A single file is read without a lock and rewritten in place only if no
 	other writer changed it since the read (else it is read again, up to
 	``_SPEC_REWRITE_ATTEMPTS`` times). A path naming one part of a multi-part
-	store is refused.
+	store is refused, and so is a single file declaring a spec version newer
+	than ``MAX_SPEC_VERSION``.
 	"""
 	reporter = _Reporter(fileName, teeLogger)
 	attempt = None
@@ -3074,6 +3077,10 @@ def _specClearTabularFile(fileName, teeLogger=None, header='', verifyHeader=Fals
 				break
 			if stamp is None or load.parts != parts:
 				continue  # the set of parts changed under the read
+			if load.state.newestVersion > MAX_SPEC_VERSION:
+				attempt.note('refused', None, 'clear skipped: the part declares a spec version newer than {} (#_version_#), whose '
+							 'markers this TSVZ cannot keep (spec §19.8); nothing was written'.format(MAX_SPEC_VERSION))
+				return False
 			if any(header) and verifyHeader and load.headerLine is not None and not headerChecked:
 				headerChecked = True
 				if not _lineContainHeader(header, load.headerLine[1:], verbose=verbose, teeLogger=teeLogger, strict=strict, delimiter=delimiter):
@@ -3156,8 +3163,8 @@ def _specScrub(fileName, teeLogger=None, header='', createIfNotExist=False, veri
 	writer changed it since the read (else it is read again, up to
 	``_SPEC_REWRITE_ATTEMPTS`` times), so a record committed meanwhile is
 	never compacted away. ``done`` is False when nothing was written because
-	the store is missing, has several parts (or the path names one part), or
-	kept changing. It is None when the read stopped at damaged data (spec
+	the store is missing, has several parts (or the path names one part),
+	declares a spec version newer than ``MAX_SPEC_VERSION``, or kept changing. It is None when the read stopped at damaged data (spec
 	§4.10): the part was rewritten from what was read, the original kept.
 	"""
 	if taskDic is None:
@@ -3193,6 +3200,11 @@ def _specScrub(fileName, teeLogger=None, header='', createIfNotExist=False, veri
 				return taskDic, False
 			if stamp is None or load.parts != parts:
 				continue  # the set of parts changed under the read
+			if load.state.newestVersion > MAX_SPEC_VERSION:
+				attempt.note('refused', None, 'scrub skipped: the store declares a spec version newer than {0} (#_version_#), which '
+							 'this TSVZ reads as version {0} only (spec §6.3); a rewrite would make that reading permanent; '
+							 'nothing was written'.format(MAX_SPEC_VERSION))
+				return taskDic, False
 			info = load.infos[0]
 			if (info.lost or info.damaged) and backedUp != stamp:
 				# Damaged data is not in what is written, or only unverified (spec §4.10, §16.6): keep the original