From: Skip Montanaro <skip@pobox.com>
Date: Wed, 28 Dec 2005 15:37:25 +0000 (+0000)
Subject: Fix for problem with Sniffer class.  If your delimiter is whitespace and the
X-Git-Tag: v2.5a0~938
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91bb70c5c07c2e73535638df2baadb302d9d71d2;p=thirdparty%2FPython%2Fcpython.git

Fix for problem with Sniffer class.  If your delimiter is whitespace and the
last field was empty it would strip the delimiter and incorrectly guess that
"" was the delimiter.  Reported in c.l.py by Laurent Laporte.  Will
backport.
---

diff --git a/Lib/csv.py b/Lib/csv.py
index 14b4d17c2342..75163800834c 100644
--- a/Lib/csv.py
+++ b/Lib/csv.py
@@ -271,7 +271,7 @@ class Sniffer:
                 for char in ascii:
                     metaFrequency = charFrequency.get(char, {})
                     # must count even if frequency is 0
-                    freq = line.strip().count(char)
+                    freq = line.count(char)
                     # value is the mode
                     metaFrequency[freq] = metaFrequency.get(freq, 0) + 1
                     charFrequency[char] = metaFrequency
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py
index f1f183f3fb11..0ad77ef09c6e 100644
--- a/Lib/test/test_csv.py
+++ b/Lib/test/test_csv.py
@@ -836,7 +836,6 @@ Stonecutters Seafood and Chop House, Lemont, IL, 12/19/02, Week Back
 'Tommy''s Place':'Blue Island':'IL':'12/28/02':'Blue Sunday/White Crow'
 'Stonecutters Seafood and Chop House':'Lemont':'IL':'12/19/02':'Week Back'
 """
-
     header = '''\
 "venue","city","state","date","performers"
 '''
@@ -852,6 +851,8 @@ Stonecutters Seafood and Chop House, Lemont, IL, 12/19/02, Week Back
 47483648;43.0;170;abc;def
 '''
 
+    sample5 = "aaa\tbbb\r\nAAA\t\r\nBBB\t\r\n"
+
     def test_has_header(self):
         sniffer = csv.Sniffer()
         self.assertEqual(sniffer.has_header(self.sample1), False)
@@ -879,6 +880,8 @@ Stonecutters Seafood and Chop House, Lemont, IL, 12/19/02, Week Back
         self.assertEqual(dialect.delimiter, "/")
         dialect = sniffer.sniff(self.sample4)
         self.assertEqual(dialect.delimiter, ";")
+        dialect = sniffer.sniff(self.sample5)
+        self.assertEqual(dialect.delimiter, "\t")
 
 if not hasattr(sys, "gettotalrefcount"):
     if test_support.verbose: print "*** skipping leakage tests ***"