diff --git a/src/caoscrawler/crawl.py b/src/caoscrawler/crawl.py index 4f0a692e4b8b8fa4bc0a90c7eae986466ca125ac..f016df6ab0ad0ab848c6cf9d02f938fd5878a9cf 100644 --- a/src/caoscrawler/crawl.py +++ b/src/caoscrawler/crawl.py @@ -51,18 +51,15 @@ from caosadvancedtools.cache import UpdateCache from caosadvancedtools.crawler import Crawler as OldCrawler from caosadvancedtools.serverside.helper import send_mail from caosadvancedtools.utils import create_entity_link -from linkahead.apiutils import (EntityMergeConflictError, compare_entities, +from linkahead.apiutils import (compare_entities, merge_entities) from linkahead.cached import cache_clear, cached_get_entity_by from linkahead.common.datatype import get_list_datatype, is_reference -from linkahead.exceptions import EmptyUniqueQueryError from linkahead.utils.escape import escape_squoted_text from .config import get_config_setting from .converters import Converter, ConverterValidationError from .debug_tree import DebugTree -from .exceptions import MissingIdentifyingProperty -from .identifiable import Identifiable from .identifiable_adapters import (CaosDBIdentifiableAdapter, IdentifiableAdapter) from .logging import configure_server_side_logging