|
24 | 24 | from . import html |
25 | 25 | from . import fastbasic |
26 | 26 | from . import cparser |
| 27 | +from . import fixedwidth |
27 | 28 |
|
28 | 29 | from ...table import Table |
29 | 30 | from ...utils.data import get_readable_fileobj |
@@ -180,18 +181,19 @@ def _guess(table, read_kwargs, format, fast_reader): |
180 | 181 |
|
181 | 182 | # Keep a trace of all failed guesses kwarg |
182 | 183 | failed_kwargs = [] |
183 | | - fast_kwargs = [] |
| 184 | + full_list_guess = _get_guess_kwargs_list(read_kwargs) |
184 | 185 |
|
185 | | - first_kwargs = [read_kwargs.copy()] |
186 | 186 | if fast_reader and format is not None and 'fast_{0}'.format(format) in \ |
187 | 187 | core.FAST_CLASSES: |
188 | 188 | # If a fast version of the reader is available, try that before the slow version |
189 | 189 | fast_kwargs = read_kwargs.copy() |
190 | 190 | fast_kwargs['Reader'] = core.FAST_CLASSES['fast_{0}'.format(format)] |
191 | | - first_kwargs = [fast_kwargs] + first_kwargs |
| 191 | + full_list_guess = [fast_kwargs] + full_list_guess |
| 192 | + else: |
| 193 | + fast_kwargs = None |
192 | 194 |
|
193 | 195 | # First try guessing |
194 | | - for guess_kwargs in first_kwargs + _get_guess_kwargs_list(): |
| 196 | + for guess_kwargs in full_list_guess: |
195 | 197 | guess_kwargs_ok = True # guess_kwargs are consistent with user_kwargs? |
196 | 198 | for key, val in read_kwargs.items(): |
197 | 199 | # Do guess_kwargs.update(read_kwargs) except that if guess_args has |
@@ -248,18 +250,32 @@ def _guess(table, read_kwargs, format, fast_reader): |
248 | 250 | lines.extend(msg) |
249 | 251 | raise core.InconsistentTableError('\n'.join(lines)) |
250 | 252 |
|
251 | | -def _get_guess_kwargs_list(): |
252 | | - guess_kwargs_list = [dict(Reader=basic.Rdb), |
253 | | - dict(Reader=fastbasic.FastTab), |
254 | | - dict(Reader=basic.Tab), |
255 | | - dict(Reader=cds.Cds), |
256 | | - dict(Reader=daophot.Daophot), |
257 | | - dict(Reader=sextractor.SExtractor), |
258 | | - dict(Reader=ipac.Ipac), |
259 | | - dict(Reader=latex.Latex), |
260 | | - dict(Reader=latex.AASTex), |
261 | | - dict(Reader=html.HTML) |
262 | | - ] |
| 253 | +def _get_guess_kwargs_list(read_kwargs): |
| 254 | + guess_kwargs_list = [] |
| 255 | + # First try readers that accept the common arguments with the input arguments |
| 256 | + # (Unless there are not arguments - we try that in the next step anyway.) |
| 257 | + # FixedWidthTwoLine would also be read by Basic, so it needs to come first. |
| 258 | + if len(read_kwargs) > 0: |
| 259 | + for reader in [fixedwidth.FixedWidthTwoLine, |
| 260 | + basic.Basic]: |
| 261 | + first_kwargs = read_kwargs.copy() |
| 262 | + first_kwargs.update(dict(Reader=reader)) |
| 263 | + guess_kwargs_list.append(first_kwargs) |
| 264 | + # Then try a list of readers with default arguments |
| 265 | + guess_kwargs_list.extend([dict(Reader=fixedwidth.FixedWidthTwoLine), |
| 266 | + dict(Reader=fastbasic.FastBasic), |
| 267 | + dict(Reader=basic.Basic), |
| 268 | + dict(Reader=basic.Rdb), |
| 269 | + dict(Reader=fastbasic.FastTab), |
| 270 | + dict(Reader=basic.Tab), |
| 271 | + dict(Reader=cds.Cds), |
| 272 | + dict(Reader=daophot.Daophot), |
| 273 | + dict(Reader=sextractor.SExtractor), |
| 274 | + dict(Reader=ipac.Ipac), |
| 275 | + dict(Reader=latex.Latex), |
| 276 | + dict(Reader=latex.AASTex), |
| 277 | + dict(Reader=html.HTML) |
| 278 | + ]) |
263 | 279 | for Reader in (basic.CommentedHeader, fastbasic.FastBasic, basic.Basic, |
264 | 280 | fastbasic.FastNoHeader, basic.NoHeader): |
265 | 281 | for delimiter in ("|", ",", " ", "\s"): |
|
0 commit comments