diff --git a/src/caoscrawler/__init__.py b/src/caoscrawler/__init__.py index 27bdbfd371e10826d007480b4189bd2cd148344c..9beadc11ef8bb8fe6bc21b8df55cd21240586273 100644 --- a/src/caoscrawler/__init__.py +++ b/src/caoscrawler/__init__.py @@ -1,15 +1,5 @@ from . import converters, utils, xml_converter -try: - from .conv_impl.spss import SPSSConverter -except ImportError as err: - SPSSConverter: type = utils.MissingImport( - name="SPSSConverter", hint="Try installing with the `spss` extra option.", - err=err) from .crawl import Crawler, SecurityMode from .version import CfoodRequiredVersionError, get_caoscrawler_version __version__ = get_caoscrawler_version() - -# Convenience members ######################################################### -# mypy: disable-error-code="attr-defined" -converters.SPSSConverter = SPSSConverter diff --git a/src/caoscrawler/conv_impl/__init__.py b/src/caoscrawler/conv_impl/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/src/caoscrawler/converters/__init__.py b/src/caoscrawler/converters/__init__.py index a7fa95b3873788976d893c06276c95bb0aa31b3c..b7bae03b6d779d52291c9858a6f7d29df67aef85 100644 --- a/src/caoscrawler/converters/__init__.py +++ b/src/caoscrawler/converters/__init__.py @@ -19,3 +19,14 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. """Submdule containing all default and optional converters.""" + +from .. import utils +from .converters import * + +try: + from .converters.spss import SPSSConverter +except ImportError as err: + SPSSConverter: type = utils.MissingImport( + name="SPSSConverter", hint="Try installing with the `spss` extra option.", + err=err) + diff --git a/src/caoscrawler/converters/converters.py b/src/caoscrawler/converters/converters.py index 9805d1103e380f688b40a9bfd4c3d03129dbd591..d8efe1f35eca8e02282343bb1c3d526c2ab39d35 100644 --- a/src/caoscrawler/converters/converters.py +++ b/src/caoscrawler/converters/converters.py @@ -41,12 +41,12 @@ import yaml import yaml_header_tools from jsonschema import ValidationError, validate -from .stores import GeneralStore, RecordStore -from .structure_elements import (BooleanElement, DictElement, Directory, File, +from ..stores import GeneralStore, RecordStore +from ..structure_elements import (BooleanElement, DictElement, Directory, File, FloatElement, IntegerElement, JSONFile, ListElement, NoneElement, StructureElement, TextElement) -from .utils import has_parent +from ..utils import has_parent # These are special properties which are (currently) treated differently # by the converters: diff --git a/src/caoscrawler/converters/hdf5_converter.py b/src/caoscrawler/converters/hdf5_converter.py index 482d59c12d2d0b8540c01bd04da718d9c514ddc4..a4d974bd53fc4b0e22d155f01a6a47295b79e984 100644 --- a/src/caoscrawler/converters/hdf5_converter.py +++ b/src/caoscrawler/converters/hdf5_converter.py @@ -36,8 +36,8 @@ import linkahead as db from .converters import (convert_basic_element, Converter, DictElementConverter, match_name_and_value, SimpleFileConverter) -from .stores import GeneralStore, RecordStore -from .structure_elements import DictElement, File, FloatElement, IntegerElement, StructureElement +from ..stores import GeneralStore, RecordStore +from ..structure_elements import DictElement, File, FloatElement, IntegerElement, StructureElement def convert_attributes(elt: Union[h5py.File, h5py.Group, h5py.Dataset]): diff --git a/src/caoscrawler/converters/spss.py b/src/caoscrawler/converters/spss.py index 5dfad0ff8be55e2ca3ddf0db3397dbac5fc9f2b0..3f1c36628f5e98e03aa84fba2bb3b776c8883f82 100644 --- a/src/caoscrawler/converters/spss.py +++ b/src/caoscrawler/converters/spss.py @@ -28,7 +28,8 @@ import pandas as pd import pyreadstat import yaml -from .. import converters +import .converters + from ..stores import GeneralStore from ..structure_elements import (File, StructureElement) from typing import Optional, Any