This commit is contained in:
Richard Brooksby 2013-06-14 08:46:11 -07:00
commit 1d0d6c6ffa

View file

@ -345,15 +345,16 @@ def read_file(path, fmt=None, settings=None):
if settings is None: if settings is None:
settings = {} settings = {}
reader = EXTENSIONS[fmt](settings) cls = EXTENSIONS[fmt]
if not cls.enabled:
raise ValueError("Missing dependencies for %s" % fmt)
reader = cls(settings)
settings_key = '%s_EXTENSIONS' % fmt.upper() settings_key = '%s_EXTENSIONS' % fmt.upper()
if settings and settings_key in settings: if settings and settings_key in settings:
reader.extensions = settings[settings_key] reader.extensions = settings[settings_key]
if not reader.enabled:
raise ValueError("Missing dependencies for %s" % fmt)
metadata = parse_path_metadata( metadata = parse_path_metadata(
path=path, settings=settings, process=reader.process_metadata) path=path, settings=settings, process=reader.process_metadata)
content, reader_metadata = reader.read(path) content, reader_metadata = reader.read(path)