[Python-checkins] python/nondist/sandbox/csv/util sniffer.py,1.2,1.3

cliffwells18@users.sourceforge.net cliffwells18@users.sourceforge.net
Fri, 14 Mar 2003 13:10:34 -0800


Update of /cvsroot/python/python/nondist/sandbox/csv/util
In directory sc8-pr-cvs1:/tmp/cvs-serv29487

Modified Files:
	sniffer.py 
Log Message:
Minor bugfixes.  No longer punts when there isn't a quotechar or delimiter, just returns '' instead.


Index: sniffer.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/csv/util/sniffer.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sniffer.py	12 Mar 2003 21:45:05 -0000	1.2
--- sniffer.py	14 Mar 2003 21:10:27 -0000	1.3
***************
*** 7,17 ****
  
  from csv import csv
! import re, string
  
  class Sniffer:
      """
      "Sniffs" the format of a CSV file (i.e. delimiter, quotechar)
!     Sniffer.dialect will be either a csv.Dialect object or None
!     if the file format couldn't be determined.
      """
      def __init__(self, sample = 16 * 1024):
--- 7,16 ----
  
  from csv import csv
! import re
  
  class Sniffer:
      """
      "Sniffs" the format of a CSV file (i.e. delimiter, quotechar)
!     Returns a csv.Dialect object.
      """
      def __init__(self, sample = 16 * 1024):
***************
*** 184,188 ****
  
          if not delims:
!             return None
  
          # if there's more than one, fall back to a 'preferred' list
--- 183,187 ----
  
          if not delims:
!             return ('', 0)
  
          # if there's more than one, fall back to a 'preferred' list