Skip to content

Commit a9b1d9e

Browse files
committed
Hard-code ASCII types in deferred types
1 parent dcaf1a6 commit a9b1d9e

2 files changed

Lines changed: 35 additions & 26 deletions

File tree

‎astropy/io/ascii/core.py‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -770,20 +770,6 @@ def __init__(cls, name, bases, dct):
770770

771771
FORMAT_CLASSES[format] = cls
772772

773-
io_formats = ['ascii.' + format] + dct.get('_io_registry_format_aliases', [])
774-
775-
if dct.get('_io_registry_suffix'):
776-
func = functools.partial(connect.io_identify, dct['_io_registry_suffix'])
777-
connect.io_registry.register_identifier(io_formats[0], Table, func)
778-
779-
for io_format in io_formats:
780-
func = functools.partial(connect.io_read, io_format)
781-
connect.io_registry.register_reader(io_format, Table, func)
782-
783-
if dct.get('_io_registry_can_write', True):
784-
func = functools.partial(connect.io_write, io_format)
785-
connect.io_registry.register_writer(io_format, Table, func)
786-
787773

788774
def _is_number(x):
789775
with ignored(ValueError):

‎astropy/io/registry.py‎

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import re
77
import sys
8+
from functools import partial
89

910
import numpy as np
1011

@@ -24,6 +25,13 @@
2425
_writers = OrderedDict()
2526
_identifiers = OrderedDict()
2627

28+
BUILTIN_ASCII_FORMATS = ['aastex', 'basic', 'cds', 'commented_header', 'csv',
29+
'daophot', 'fast_basic', 'fast_commented_header',
30+
'fast_csv', 'fast_no_header', 'fast_rdb',
31+
'fast_tab', 'fixed_width', 'fixed_width_no_header',
32+
'fixed_width_two_line', 'html', 'ipac', 'latex',
33+
'no_header', 'rdb', 'sextractor', 'tab']
34+
2735
# Add built-in readers/writers to the registry manually, and refer to the
2836
# functions by strings to avoid importing those modules.
2937
def _register_builtins():
@@ -58,9 +66,27 @@ def _register_builtins():
5866
register_reader('ascii', Table, 'astropy.io.ascii.connect.read_asciitable')
5967
register_writer('ascii', Table, 'astropy.io.ascii.connect.write_asciitable')
6068

61-
# Remaining ASCII formats - for now can only import io.ascii to force
62-
# meta-classes to register.
63-
from . import ascii
69+
# Specific ASCII formats
70+
for ascii_format in BUILTIN_ASCII_FORMATS:
71+
register_reader('ascii.{0}'.format(ascii_format), Table,
72+
('astropy.io.ascii.ui.read', [], {'format':ascii_format}))
73+
register_writer('ascii.{0}'.format(ascii_format), Table,
74+
('astropy.io.ascii.ui.write', [], {'format':ascii_format}))
75+
76+
register_identifier('csv', Table, ('astropy.io.ascii.connect.io_identify', ['csv'], {}))
77+
register_identifier('rdb', Table, ('astropy.io.ascii.connect.io_identify', ['rdb'], {}))
78+
register_identifier('html', Table, ('astropy.io.ascii.connect.io_identify', ['html'], {}))
79+
register_identifier('tex', Table, ('astropy.io.ascii.connect.io_identify', ['tex'], {}))
80+
81+
82+
DEFERRED_TYPES = six.string_types + (tuple,)
83+
84+
def _resolve_deferred(function):
85+
if isinstance(function, six.string_types):
86+
return _get_function_by_string(function)
87+
elif isinstance(function, tuple):
88+
return partial(_get_function_by_string(function[0]), *function[1], **function[2])
89+
6490

6591
def _get_function_by_string(path_to_function):
6692
import importlib
@@ -294,9 +320,8 @@ def identify_format(origin, data_class_required, path, fileobj, args, kwargs):
294320
for data_format, data_class in _identifiers:
295321
if _is_best_match(data_class_required, data_class, _identifiers):
296322
identifier = _identifiers[(data_format, data_class)]
297-
if isinstance(identifier, six.string_types):
298-
identifier = _get_function_by_string(identifier)
299-
_identifiers[(data_format, data_class)] = identifier
323+
if isinstance(identifier, DEFERRED_TYPES):
324+
identifier = _identifiers[(data_format, data_class)] = _resolve_deferred(identifier)
300325
if identifier(
301326
origin, path, fileobj, *args, **kwargs):
302327
valid_formats.append(data_format)
@@ -321,9 +346,8 @@ def get_reader(data_format, data_class):
321346
for reader_format, reader_class in readers:
322347
if _is_best_match(data_class, reader_class, readers):
323348
reader = _readers[(reader_format, reader_class)]
324-
if isinstance(reader, six.string_types):
325-
reader = _get_function_by_string(reader)
326-
_readers[(reader_format, reader_class)] = reader
349+
if isinstance(reader, DEFERRED_TYPES):
350+
reader = _readers[(data_format, data_class)] = _resolve_deferred(reader)
327351
return reader
328352
else:
329353
format_table_str = _get_format_table_str(data_class, 'Read')
@@ -339,9 +363,8 @@ def get_writer(data_format, data_class):
339363
for writer_format, writer_class in writers:
340364
if _is_best_match(data_class, writer_class, writers):
341365
writer = _writers[(writer_format, writer_class)]
342-
if isinstance(writer, six.string_types):
343-
writer = _get_function_by_string(writer)
344-
_writers[(writer_format, writer_class)] = writer
366+
if isinstance(writer, DEFERRED_TYPES):
367+
writer = _writers[(data_format, data_class)] = _resolve_deferred(writer)
345368
return writer
346369
else:
347370
format_table_str = _get_format_table_str(data_class, 'Write')

0 commit comments

Comments
 (0)