[Python-checkins] commit of r41839 - in python/branches/release24-maint/Lib: csv.py test/test_csv.py

Wed Dec 28 16:43:54 CET 2005

Author: skip.montanaro
Date: Wed Dec 28 16:43:50 2005
New Revision: 41839
Modified:
 python/branches/release24-maint/Lib/csv.py
 python/branches/release24-maint/Lib/test/test_csv.py
Log:
backport Sniffer class fix (rev 41838)
Modified: python/branches/release24-maint/Lib/csv.py
==============================================================================

--- python/branches/release24-maint/Lib/csv.py	(original)
+++ python/branches/release24-maint/Lib/csv.py	Wed Dec 28 16:43:50 2005
@@ -294,7 +294,7 @@
 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
Modified: python/branches/release24-maint/Lib/test/test_csv.py
==============================================================================
--- python/branches/release24-maint/Lib/test/test_csv.py	(original)
+++ python/branches/release24-maint/Lib/test/test_csv.py	Wed Dec 28 16:43:50 2005
@@ -738,6 +738,8 @@
 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)
@@ -765,6 +767,8 @@
 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 ***"
