Mercurial > cpython-lru_cache-weakref
annotate Lib/csv.py @ 48715:48dddfd2fbf3
RPC_WSTR is not available Visual Studio 2003 or earlier.
(Maybe I should have defined RPC_WSTR on old compiler,
but uuidcreate() is only place using it, so I simply replaced
with unsigned short *)
| author | Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp> |
|---|---|
| date | Sun, 17 Aug 2008 07:26:26 +0000 |
| parents | 1a11717a154b |
| children | edb5a8593749 |
| rev | line source |
|---|---|
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
2 """ |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
3 csv.py - read/write/investigate CSV files |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
4 """ |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
5 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
6 import re |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
7 from _csv import Error, __version__, writer, reader, register_dialect, \ |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
8 unregister_dialect, get_dialect, list_dialects, \ |
|
34406
b93845ce4454
Rename csv.set_field_limit to csv.field_size_limit (since it both sets and
Andrew McNamara <andrewm@object-craft.com.au>
parents:
34396
diff
changeset
|
9 field_size_limit, \ |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
10 QUOTE_MINIMAL, QUOTE_ALL, QUOTE_NONNUMERIC, QUOTE_NONE, \ |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
11 __doc__ |
|
34393
b6ec1b3b9fce
Replace python-coded validation of csv dialect with a call to the C
Andrew McNamara <andrewm@object-craft.com.au>
parents:
34340
diff
changeset
|
12 from _csv import Dialect as _Dialect |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
13 |
|
41760
1a9cd76364e3
Change some uses of cStringIO.StringIO to io.StringIO.
Guido van Rossum <guido@python.org>
parents:
41554
diff
changeset
|
14 from io import StringIO |
|
28828
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
15 |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
16 __all__ = [ "QUOTE_MINIMAL", "QUOTE_ALL", "QUOTE_NONNUMERIC", "QUOTE_NONE", |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
17 "Error", "Dialect", "excel", "excel_tab", "reader", "writer", |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
18 "register_dialect", "get_dialect", "list_dialects", "Sniffer", |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
19 "unregister_dialect", "__version__", "DictReader", "DictWriter" ] |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
20 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
21 class Dialect: |
|
34325
ee808e08dd6f
add a couple missing docstrings
Skip Montanaro <skip@pobox.com>
parents:
30632
diff
changeset
|
22 """Describe an Excel dialect. |
|
ee808e08dd6f
add a couple missing docstrings
Skip Montanaro <skip@pobox.com>
parents:
30632
diff
changeset
|
23 |
|
ee808e08dd6f
add a couple missing docstrings
Skip Montanaro <skip@pobox.com>
parents:
30632
diff
changeset
|
24 This must be subclassed (see csv.excel). Valid attributes are: |
|
ee808e08dd6f
add a couple missing docstrings
Skip Montanaro <skip@pobox.com>
parents:
30632
diff
changeset
|
25 delimiter, quotechar, escapechar, doublequote, skipinitialspace, |
|
ee808e08dd6f
add a couple missing docstrings
Skip Montanaro <skip@pobox.com>
parents:
30632
diff
changeset
|
26 lineterminator, quoting. |
|
ee808e08dd6f
add a couple missing docstrings
Skip Montanaro <skip@pobox.com>
parents:
30632
diff
changeset
|
27 |
|
ee808e08dd6f
add a couple missing docstrings
Skip Montanaro <skip@pobox.com>
parents:
30632
diff
changeset
|
28 """ |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
29 _name = "" |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
30 _valid = False |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
31 # placeholders |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
32 delimiter = None |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
33 quotechar = None |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
34 escapechar = None |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
35 doublequote = None |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
36 skipinitialspace = None |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
37 lineterminator = None |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
38 quoting = None |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
39 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
40 def __init__(self): |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
41 if self.__class__ != Dialect: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
42 self._valid = True |
|
34393
b6ec1b3b9fce
Replace python-coded validation of csv dialect with a call to the C
Andrew McNamara <andrewm@object-craft.com.au>
parents:
34340
diff
changeset
|
43 self._validate() |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
44 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
45 def _validate(self): |
|
34393
b6ec1b3b9fce
Replace python-coded validation of csv dialect with a call to the C
Andrew McNamara <andrewm@object-craft.com.au>
parents:
34340
diff
changeset
|
46 try: |
|
b6ec1b3b9fce
Replace python-coded validation of csv dialect with a call to the C
Andrew McNamara <andrewm@object-craft.com.au>
parents:
34340
diff
changeset
|
47 _Dialect(self) |
|
40587
6b18a095c2e7
SF patch 1631942 by Collin Winter:
Guido van Rossum <guido@python.org>
parents:
39627
diff
changeset
|
48 except TypeError as e: |
|
34393
b6ec1b3b9fce
Replace python-coded validation of csv dialect with a call to the C
Andrew McNamara <andrewm@object-craft.com.au>
parents:
34340
diff
changeset
|
49 # We do this for compatibility with py2.3 |
|
b6ec1b3b9fce
Replace python-coded validation of csv dialect with a call to the C
Andrew McNamara <andrewm@object-craft.com.au>
parents:
34340
diff
changeset
|
50 raise Error(str(e)) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
51 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
52 class excel(Dialect): |
|
34325
ee808e08dd6f
add a couple missing docstrings
Skip Montanaro <skip@pobox.com>
parents:
30632
diff
changeset
|
53 """Describe the usual properties of Excel-generated CSV files.""" |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
54 delimiter = ',' |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
55 quotechar = '"' |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
56 doublequote = True |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
57 skipinitialspace = False |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
58 lineterminator = '\r\n' |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
59 quoting = QUOTE_MINIMAL |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
60 register_dialect("excel", excel) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
61 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
62 class excel_tab(excel): |
|
34325
ee808e08dd6f
add a couple missing docstrings
Skip Montanaro <skip@pobox.com>
parents:
30632
diff
changeset
|
63 """Describe the usual properties of Excel-generated TAB-delimited files.""" |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
64 delimiter = '\t' |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
65 register_dialect("excel-tab", excel_tab) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
66 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
67 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
68 class DictReader: |
|
30632
f9dfdcb897bb
Make the fieldnames argument optional in the DictReader. If self.fieldnames
Skip Montanaro <skip@pobox.com>
parents:
30356
diff
changeset
|
69 def __init__(self, f, fieldnames=None, restkey=None, restval=None, |
|
30356
7504812fdb7e
**kwds arg was missing from __init__ for Dict{Reader,Writer} classes.
Skip Montanaro <skip@pobox.com>
parents:
30292
diff
changeset
|
70 dialect="excel", *args, **kwds): |
|
48670
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
71 self._fieldnames = fieldnames # list of keys for the dict |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
72 self.restkey = restkey # key to catch long rows |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
73 self.restval = restval # default value for short rows |
|
30356
7504812fdb7e
**kwds arg was missing from __init__ for Dict{Reader,Writer} classes.
Skip Montanaro <skip@pobox.com>
parents:
30292
diff
changeset
|
74 self.reader = reader(f, dialect, *args, **kwds) |
|
45996
376b5cb8a014
Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
43020
diff
changeset
|
75 self.dialect = dialect |
|
376b5cb8a014
Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
43020
diff
changeset
|
76 self.line_num = 0 |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
77 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
78 def __iter__(self): |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
79 return self |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
80 |
|
48670
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
81 @property |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
82 def fieldnames(self): |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
83 if self._fieldnames is None: |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
84 try: |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
85 self._fieldnames = next(self.reader) |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
86 except StopIteration: |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
87 pass |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
88 self.line_num = self.reader.line_num |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
89 return self._fieldnames |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
90 |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
91 @fieldnames.setter |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
92 def fieldnames(self, value): |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
93 self._fieldnames = value |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
94 |
|
41501
0c5019afc55b
PEP 3114: rename .next() to .__next__() and add next() builtin.
Georg Brandl <georg@python.org>
parents:
40809
diff
changeset
|
95 def __next__(self): |
|
48670
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
96 if self.line_num == 0: |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
97 # Used only for its side effect. |
|
1a11717a154b
Merged revisions 65605 via svnmerge from
Skip Montanaro <skip@pobox.com>
parents:
46548
diff
changeset
|
98 self.fieldnames |
|
41501
0c5019afc55b
PEP 3114: rename .next() to .__next__() and add next() builtin.
Georg Brandl <georg@python.org>
parents:
40809
diff
changeset
|
99 row = next(self.reader) |
|
45996
376b5cb8a014
Merged revisions 61687-61688,61696,61700,61704-61705,61707-61709,61711-61712,61714-61716,61718-61722 via svnmerge from
Christian Heimes <christian@cheimes.de>
parents:
43020
diff
changeset
|
100 self.line_num = self.reader.line_num |
|
30632
f9dfdcb897bb
Make the fieldnames argument optional in the DictReader. If self.fieldnames
Skip Montanaro <skip@pobox.com>
parents:
30356
diff
changeset
|
101 |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
102 # unlike the basic reader, we prefer not to return blanks, |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
103 # because we will typically wind up with a dict full of None |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
104 # values |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
105 while row == []: |
|
41501
0c5019afc55b
PEP 3114: rename .next() to .__next__() and add next() builtin.
Georg Brandl <georg@python.org>
parents:
40809
diff
changeset
|
106 row = next(self.reader) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
107 d = dict(zip(self.fieldnames, row)) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
108 lf = len(self.fieldnames) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
109 lr = len(row) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
110 if lf < lr: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
111 d[self.restkey] = row[lf:] |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
112 elif lf > lr: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
113 for key in self.fieldnames[lr:]: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
114 d[key] = self.restval |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
115 return d |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
116 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
117 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
118 class DictWriter: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
119 def __init__(self, f, fieldnames, restval="", extrasaction="raise", |
|
30356
7504812fdb7e
**kwds arg was missing from __init__ for Dict{Reader,Writer} classes.
Skip Montanaro <skip@pobox.com>
parents:
30292
diff
changeset
|
120 dialect="excel", *args, **kwds): |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
121 self.fieldnames = fieldnames # list of keys for the dict |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
122 self.restval = restval # for writing short dicts |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
123 if extrasaction.lower() not in ("raise", "ignore"): |
|
43020
907a45df1295
Raise statement normalization in Lib/.
Collin Winter <collinw@gmail.com>
parents:
42142
diff
changeset
|
124 raise ValueError("extrasaction (%s) must be 'raise' or 'ignore'" |
|
907a45df1295
Raise statement normalization in Lib/.
Collin Winter <collinw@gmail.com>
parents:
42142
diff
changeset
|
125 % extrasaction) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
126 self.extrasaction = extrasaction |
|
30356
7504812fdb7e
**kwds arg was missing from __init__ for Dict{Reader,Writer} classes.
Skip Montanaro <skip@pobox.com>
parents:
30292
diff
changeset
|
127 self.writer = writer(f, dialect, *args, **kwds) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
128 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
129 def _dict_to_list(self, rowdict): |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
130 if self.extrasaction == "raise": |
|
41554
06145fbc7ab9
Merged revisions 53952-54987 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41501
diff
changeset
|
131 wrong_fields = [k for k in rowdict if k not in self.fieldnames] |
|
06145fbc7ab9
Merged revisions 53952-54987 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41501
diff
changeset
|
132 if wrong_fields: |
|
43020
907a45df1295
Raise statement normalization in Lib/.
Collin Winter <collinw@gmail.com>
parents:
42142
diff
changeset
|
133 raise ValueError("dict contains fields not in fieldnames: " |
|
907a45df1295
Raise statement normalization in Lib/.
Collin Winter <collinw@gmail.com>
parents:
42142
diff
changeset
|
134 + ", ".join(wrong_fields)) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
135 return [rowdict.get(key, self.restval) for key in self.fieldnames] |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
136 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
137 def writerow(self, rowdict): |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
138 return self.writer.writerow(self._dict_to_list(rowdict)) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
139 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
140 def writerows(self, rowdicts): |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
141 rows = [] |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
142 for rowdict in rowdicts: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
143 rows.append(self._dict_to_list(rowdict)) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
144 return self.writer.writerows(rows) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
145 |
|
29411
bac2c0e7c20a
SF Patch #744104: Remove eval() from csv
Raymond Hettinger <python@rcn.com>
parents:
29169
diff
changeset
|
146 # Guard Sniffer's type checking against builds that exclude complex() |
|
bac2c0e7c20a
SF Patch #744104: Remove eval() from csv
Raymond Hettinger <python@rcn.com>
parents:
29169
diff
changeset
|
147 try: |
|
bac2c0e7c20a
SF Patch #744104: Remove eval() from csv
Raymond Hettinger <python@rcn.com>
parents:
29169
diff
changeset
|
148 complex |
|
bac2c0e7c20a
SF Patch #744104: Remove eval() from csv
Raymond Hettinger <python@rcn.com>
parents:
29169
diff
changeset
|
149 except NameError: |
|
bac2c0e7c20a
SF Patch #744104: Remove eval() from csv
Raymond Hettinger <python@rcn.com>
parents:
29169
diff
changeset
|
150 complex = float |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
151 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
152 class Sniffer: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
153 ''' |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
154 "Sniffs" the format of a CSV file (i.e. delimiter, quotechar) |
|
28828
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
155 Returns a Dialect object. |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
156 ''' |
|
28828
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
157 def __init__(self): |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
158 # in case there is more than one possible delimiter |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
159 self.preferred = [',', '\t', ';', ' ', ':'] |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
160 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
161 |
|
29169
434ef174f478
* Correct Sniffer doc to correspond to the implementation.
Skip Montanaro <skip@pobox.com>
parents:
28828
diff
changeset
|
162 def sniff(self, sample, delimiters=None): |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
163 """ |
|
28828
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
164 Returns a dialect (or None) corresponding to the sample |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
165 """ |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
166 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
167 quotechar, delimiter, skipinitialspace = \ |
|
29169
434ef174f478
* Correct Sniffer doc to correspond to the implementation.
Skip Montanaro <skip@pobox.com>
parents:
28828
diff
changeset
|
168 self._guess_quote_and_delimiter(sample, delimiters) |
|
36157
96eb2a5cfbef
Fix a delimiter detection problem in sniffer. Sniffing "a|b|c\r\n" was
Skip Montanaro <skip@pobox.com>
parents:
36146
diff
changeset
|
169 if not delimiter: |
|
29169
434ef174f478
* Correct Sniffer doc to correspond to the implementation.
Skip Montanaro <skip@pobox.com>
parents:
28828
diff
changeset
|
170 delimiter, skipinitialspace = self._guess_delimiter(sample, |
|
434ef174f478
* Correct Sniffer doc to correspond to the implementation.
Skip Montanaro <skip@pobox.com>
parents:
28828
diff
changeset
|
171 delimiters) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
172 |
|
36157
96eb2a5cfbef
Fix a delimiter detection problem in sniffer. Sniffing "a|b|c\r\n" was
Skip Montanaro <skip@pobox.com>
parents:
36146
diff
changeset
|
173 if not delimiter: |
|
43020
907a45df1295
Raise statement normalization in Lib/.
Collin Winter <collinw@gmail.com>
parents:
42142
diff
changeset
|
174 raise Error("Could not determine delimiter") |
|
36157
96eb2a5cfbef
Fix a delimiter detection problem in sniffer. Sniffing "a|b|c\r\n" was
Skip Montanaro <skip@pobox.com>
parents:
36146
diff
changeset
|
175 |
|
28828
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
176 class dialect(Dialect): |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
177 _name = "sniffed" |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
178 lineterminator = '\r\n' |
|
28825
2fad548391de
Attempt to deal with some obvious errors in the code. These were all
Fred Drake <fdrake@acm.org>
parents:
28804
diff
changeset
|
179 quoting = QUOTE_MINIMAL |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
180 # escapechar = '' |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
181 doublequote = False |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
182 |
|
28828
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
183 dialect.delimiter = delimiter |
|
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
184 # _csv.reader won't accept a quotechar of '' |
|
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
185 dialect.quotechar = quotechar or '"' |
|
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
186 dialect.skipinitialspace = skipinitialspace |
|
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
187 |
|
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
188 return dialect |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
189 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
190 |
|
29169
434ef174f478
* Correct Sniffer doc to correspond to the implementation.
Skip Montanaro <skip@pobox.com>
parents:
28828
diff
changeset
|
191 def _guess_quote_and_delimiter(self, data, delimiters): |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
192 """ |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
193 Looks for text enclosed between two identical quotes |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
194 (the probable quotechar) which are preceded and followed |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
195 by the same character (the probable delimiter). |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
196 For example: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
197 ,'some text', |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
198 The quote with the most wins, same with the delimiter. |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
199 If there is no quotechar the delimiter can't be determined |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
200 this way. |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
201 """ |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
202 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
203 matches = [] |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
204 for restr in ('(?P<delim>[^\w\n"\'])(?P<space> ?)(?P<quote>["\']).*?(?P=quote)(?P=delim)', # ,".*?", |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
205 '(?:^|\n)(?P<quote>["\']).*?(?P=quote)(?P<delim>[^\w\n"\'])(?P<space> ?)', # ".*?", |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
206 '(?P<delim>>[^\w\n"\'])(?P<space> ?)(?P<quote>["\']).*?(?P=quote)(?:$|\n)', # ,".*?" |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
207 '(?:^|\n)(?P<quote>["\']).*?(?P=quote)(?:$|\n)'): # ".*?" (no delim, no space) |
|
30292
79b1a9ec5223
use the long names for re compilation options; this makes it easier to
Fred Drake <fdrake@acm.org>
parents:
29422
diff
changeset
|
208 regexp = re.compile(restr, re.DOTALL | re.MULTILINE) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
209 matches = regexp.findall(data) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
210 if matches: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
211 break |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
212 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
213 if not matches: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
214 return ('', None, 0) # (quotechar, delimiter, skipinitialspace) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
215 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
216 quotes = {} |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
217 delims = {} |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
218 spaces = 0 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
219 for m in matches: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
220 n = regexp.groupindex['quote'] - 1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
221 key = m[n] |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
222 if key: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
223 quotes[key] = quotes.get(key, 0) + 1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
224 try: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
225 n = regexp.groupindex['delim'] - 1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
226 key = m[n] |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
227 except KeyError: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
228 continue |
|
29169
434ef174f478
* Correct Sniffer doc to correspond to the implementation.
Skip Montanaro <skip@pobox.com>
parents:
28828
diff
changeset
|
229 if key and (delimiters is None or key in delimiters): |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
230 delims[key] = delims.get(key, 0) + 1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
231 try: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
232 n = regexp.groupindex['space'] - 1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
233 except KeyError: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
234 continue |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
235 if m[n]: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
236 spaces += 1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
237 |
|
39627
e86c0b29b4a2
Kill reduce(). A coproduction of John Reese, Jacques Frechet, and Alex M.
Guido van Rossum <guido@python.org>
parents:
36157
diff
changeset
|
238 quotechar = max(quotes, key=quotes.get) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
239 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
240 if delims: |
|
39627
e86c0b29b4a2
Kill reduce(). A coproduction of John Reese, Jacques Frechet, and Alex M.
Guido van Rossum <guido@python.org>
parents:
36157
diff
changeset
|
241 delim = max(delims, key=delims.get) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
242 skipinitialspace = delims[delim] == spaces |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
243 if delim == '\n': # most likely a file with a single column |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
244 delim = '' |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
245 else: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
246 # there is *no* delimiter, it's a single column of quoted data |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
247 delim = '' |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
248 skipinitialspace = 0 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
249 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
250 return (quotechar, delim, skipinitialspace) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
251 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
252 |
|
29169
434ef174f478
* Correct Sniffer doc to correspond to the implementation.
Skip Montanaro <skip@pobox.com>
parents:
28828
diff
changeset
|
253 def _guess_delimiter(self, data, delimiters): |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
254 """ |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
255 The delimiter /should/ occur the same number of times on |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
256 each row. However, due to malformed data, it may not. We don't want |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
257 an all or nothing approach, so we allow for small variations in this |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
258 number. |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
259 1) build a table of the frequency of each character on every line. |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
260 2) build a table of freqencies of this frequency (meta-frequency?), |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
261 e.g. 'x occurred 5 times in 10 rows, 6 times in 1000 rows, |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
262 7 times in 2 rows' |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
263 3) use the mode of the meta-frequency to determine the /expected/ |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
264 frequency for that character |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
265 4) find out how often the character actually meets that goal |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
266 5) the character that best meets its goal is the delimiter |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
267 For performance reasons, the data is evaluated in chunks, so it can |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
268 try and evaluate the smallest portion of the data possible, evaluating |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
269 additional chunks as necessary. |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
270 """ |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
271 |
|
42142
a53e48be6df9
Merged revisions 56125-56153 via svnmerge from
Guido van Rossum <guido@python.org>
parents:
41760
diff
changeset
|
272 data = list(filter(None, data.split('\n'))) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
273 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
274 ascii = [chr(c) for c in range(127)] # 7-bit ASCII |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
275 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
276 # build frequency tables |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
277 chunkLength = min(10, len(data)) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
278 iteration = 0 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
279 charFrequency = {} |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
280 modes = {} |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
281 delims = {} |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
282 start, end = 0, min(chunkLength, len(data)) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
283 while start < len(data): |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
284 iteration += 1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
285 for line in data[start:end]: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
286 for char in ascii: |
|
28828
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
287 metaFrequency = charFrequency.get(char, {}) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
288 # must count even if frequency is 0 |
|
36146
22dbf5818b0b
Fix for problem with Sniffer class. If your delimiter is whitespace and the
Skip Montanaro <skip@pobox.com>
parents:
34406
diff
changeset
|
289 freq = line.count(char) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
290 # value is the mode |
|
28828
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
291 metaFrequency[freq] = metaFrequency.get(freq, 0) + 1 |
|
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
292 charFrequency[char] = metaFrequency |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
293 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
294 for char in charFrequency.keys(): |
|
40809
f340cb045bf9
- PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone;
Guido van Rossum <guido@python.org>
parents:
40644
diff
changeset
|
295 items = list(charFrequency[char].items()) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
296 if len(items) == 1 and items[0][0] == 0: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
297 continue |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
298 # get the mode of the frequencies |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
299 if len(items) > 1: |
|
39627
e86c0b29b4a2
Kill reduce(). A coproduction of John Reese, Jacques Frechet, and Alex M.
Guido van Rossum <guido@python.org>
parents:
36157
diff
changeset
|
300 modes[char] = max(items, key=lambda x: x[1]) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
301 # adjust the mode - subtract the sum of all |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
302 # other frequencies |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
303 items.remove(modes[char]) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
304 modes[char] = (modes[char][0], modes[char][1] |
|
39627
e86c0b29b4a2
Kill reduce(). A coproduction of John Reese, Jacques Frechet, and Alex M.
Guido van Rossum <guido@python.org>
parents:
36157
diff
changeset
|
305 - sum(item[1] for item in items)) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
306 else: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
307 modes[char] = items[0] |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
308 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
309 # build a list of possible delimiters |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
310 modeList = modes.items() |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
311 total = float(chunkLength * iteration) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
312 # (rows of consistent data) / (number of rows) = 100% |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
313 consistency = 1.0 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
314 # minimum consistency threshold |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
315 threshold = 0.9 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
316 while len(delims) == 0 and consistency >= threshold: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
317 for k, v in modeList: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
318 if v[0] > 0 and v[1] > 0: |
|
29169
434ef174f478
* Correct Sniffer doc to correspond to the implementation.
Skip Montanaro <skip@pobox.com>
parents:
28828
diff
changeset
|
319 if ((v[1]/total) >= consistency and |
|
434ef174f478
* Correct Sniffer doc to correspond to the implementation.
Skip Montanaro <skip@pobox.com>
parents:
28828
diff
changeset
|
320 (delimiters is None or k in delimiters)): |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
321 delims[k] = v |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
322 consistency -= 0.01 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
323 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
324 if len(delims) == 1: |
|
40809
f340cb045bf9
- PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone;
Guido van Rossum <guido@python.org>
parents:
40644
diff
changeset
|
325 delim = list(delims.keys())[0] |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
326 skipinitialspace = (data[0].count(delim) == |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
327 data[0].count("%c " % delim)) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
328 return (delim, skipinitialspace) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
329 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
330 # analyze another chunkLength lines |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
331 start = end |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
332 end += chunkLength |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
333 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
334 if not delims: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
335 return ('', 0) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
336 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
337 # if there's more than one, fall back to a 'preferred' list |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
338 if len(delims) > 1: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
339 for d in self.preferred: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
340 if d in delims.keys(): |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
341 skipinitialspace = (data[0].count(d) == |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
342 data[0].count("%c " % d)) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
343 return (d, skipinitialspace) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
344 |
|
36157
96eb2a5cfbef
Fix a delimiter detection problem in sniffer. Sniffing "a|b|c\r\n" was
Skip Montanaro <skip@pobox.com>
parents:
36146
diff
changeset
|
345 # nothing else indicates a preference, pick the character that |
|
96eb2a5cfbef
Fix a delimiter detection problem in sniffer. Sniffing "a|b|c\r\n" was
Skip Montanaro <skip@pobox.com>
parents:
36146
diff
changeset
|
346 # dominates(?) |
|
96eb2a5cfbef
Fix a delimiter detection problem in sniffer. Sniffing "a|b|c\r\n" was
Skip Montanaro <skip@pobox.com>
parents:
36146
diff
changeset
|
347 items = [(v,k) for (k,v) in delims.items()] |
|
96eb2a5cfbef
Fix a delimiter detection problem in sniffer. Sniffing "a|b|c\r\n" was
Skip Montanaro <skip@pobox.com>
parents:
36146
diff
changeset
|
348 items.sort() |
|
96eb2a5cfbef
Fix a delimiter detection problem in sniffer. Sniffing "a|b|c\r\n" was
Skip Montanaro <skip@pobox.com>
parents:
36146
diff
changeset
|
349 delim = items[-1][1] |
|
96eb2a5cfbef
Fix a delimiter detection problem in sniffer. Sniffing "a|b|c\r\n" was
Skip Montanaro <skip@pobox.com>
parents:
36146
diff
changeset
|
350 |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
351 skipinitialspace = (data[0].count(delim) == |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
352 data[0].count("%c " % delim)) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
353 return (delim, skipinitialspace) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
354 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
355 |
|
28828
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
356 def has_header(self, sample): |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
357 # Creates a dictionary of types of data in each column. If any |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
358 # column is of a single type (say, integers), *except* for the first |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
359 # row, then the first row is presumed to be labels. If the type |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
360 # can't be determined, it is assumed to be a string in which case |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
361 # the length of the string is the determining factor: if all of the |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
362 # rows except for the first are the same length, it's a header. |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
363 # Finally, a 'vote' is taken at the end for each column, adding or |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
364 # subtracting from the likelihood of the first row being a header. |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
365 |
|
28828
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
366 rdr = reader(StringIO(sample), self.sniff(sample)) |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
367 |
|
41501
0c5019afc55b
PEP 3114: rename .next() to .__next__() and add next() builtin.
Georg Brandl <georg@python.org>
parents:
40809
diff
changeset
|
368 header = next(rdr) # assume first row is header |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
369 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
370 columns = len(header) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
371 columnTypes = {} |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
372 for i in range(columns): columnTypes[i] = None |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
373 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
374 checked = 0 |
|
28828
b37af21b77be
rework Sniffer api significantly
Skip Montanaro <skip@pobox.com>
parents:
28825
diff
changeset
|
375 for row in rdr: |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
376 # arbitrary number of rows to check, to keep it sane |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
377 if checked > 20: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
378 break |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
379 checked += 1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
380 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
381 if len(row) != columns: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
382 continue # skip rows that have irregular number of columns |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
383 |
|
40809
f340cb045bf9
- PEP 3106: dict.iterkeys(), .iteritems(), .itervalues() are now gone;
Guido van Rossum <guido@python.org>
parents:
40644
diff
changeset
|
384 for col in list(columnTypes.keys()): |
|
29411
bac2c0e7c20a
SF Patch #744104: Remove eval() from csv
Raymond Hettinger <python@rcn.com>
parents:
29169
diff
changeset
|
385 |
|
46548
85d4671565c8
Obvious simplification, now that "long" has disappeared.
Amaury Forgeot d'Arc <amauryfa@gmail.com>
parents:
45996
diff
changeset
|
386 for thisType in [int, float, complex]: |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
387 try: |
|
29411
bac2c0e7c20a
SF Patch #744104: Remove eval() from csv
Raymond Hettinger <python@rcn.com>
parents:
29169
diff
changeset
|
388 thisType(row[col]) |
|
bac2c0e7c20a
SF Patch #744104: Remove eval() from csv
Raymond Hettinger <python@rcn.com>
parents:
29169
diff
changeset
|
389 break |
|
29420
f87fcd0870bf
The multiple exception catch should be in a tuple.
Raymond Hettinger <python@rcn.com>
parents:
29411
diff
changeset
|
390 except (ValueError, OverflowError): |
|
29411
bac2c0e7c20a
SF Patch #744104: Remove eval() from csv
Raymond Hettinger <python@rcn.com>
parents:
29169
diff
changeset
|
391 pass |
|
bac2c0e7c20a
SF Patch #744104: Remove eval() from csv
Raymond Hettinger <python@rcn.com>
parents:
29169
diff
changeset
|
392 else: |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
393 # fallback to length of string |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
394 thisType = len(row[col]) |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
395 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
396 if thisType != columnTypes[col]: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
397 if columnTypes[col] is None: # add new column type |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
398 columnTypes[col] = thisType |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
399 else: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
400 # type is inconsistent, remove column from |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
401 # consideration |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
402 del columnTypes[col] |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
403 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
404 # finally, compare results against first row and "vote" |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
405 # on whether it's a header |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
406 hasHeader = 0 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
407 for col, colType in columnTypes.items(): |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
408 if type(colType) == type(0): # it's a length |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
409 if len(header[col]) != colType: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
410 hasHeader += 1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
411 else: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
412 hasHeader -= 1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
413 else: # attempt typecast |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
414 try: |
|
29411
bac2c0e7c20a
SF Patch #744104: Remove eval() from csv
Raymond Hettinger <python@rcn.com>
parents:
29169
diff
changeset
|
415 colType(header[col]) |
|
29422
cf8ae3b0dcdc
One more multiple exception catch should be in a tuple.
Raymond Hettinger <python@rcn.com>
parents:
29420
diff
changeset
|
416 except (ValueError, TypeError): |
|
28804
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
417 hasHeader += 1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
418 else: |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
419 hasHeader -= 1 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
420 |
|
0c950e3323ee
cvs is going to be a module again
Skip Montanaro <skip@pobox.com>
parents:
diff
changeset
|
421 return hasHeader > 0 |
