Issue #29405: Make total calculation in _guess_delimiter more accurate.

diff --git a/Lib/csv.py b/Lib/csv.py
index 0349e0bd1162c4bd6bc7ea3a387e7fbee2e7d873..6a8587674fe02b837fc7568ebafbc1df8189030c 100644 (file)
--- a/Lib/csv.py
+++ b/Lib/csv.py
@@ -307,7 +307,7 @@ class Sniffer:
         charFrequency = {}
         modes = {}
         delims = {}
-        start, end = 0, min(chunkLength, len(data))
+        start, end = 0, chunkLength
         while start < len(data):
             iteration += 1
             for line in data[start:end]:
@@ -336,7 +336,7 @@ class Sniffer:
 
             # build a list of possible delimiters
             modeList = modes.items()
-            total = float(chunkLength * iteration)
+            total = float(min(chunkLength * iteration, len(data)))
             # (rows of consistent data) / (number of rows) = 100%
             consistency = 1.0
             # minimum consistency threshold