From d2c6ec830e93cbdf6bc162112fabe2b027701797 Mon Sep 17 00:00:00 2001 From: Nora-Olivia-Ammann <103038637+Nora-Olivia-Ammann@users.noreply.github.com> Date: Wed, 27 Sep 2023 08:48:41 +0200 Subject: [PATCH] fix: ModuleNotFoundError when importing logging due to identical file name (DEV-2708) (#530) --- src/dsp_tools/cli.py | 2 +- src/dsp_tools/fast_xmlupload/process_files.py | 2 +- src/dsp_tools/fast_xmlupload/upload_files.py | 2 +- src/dsp_tools/fast_xmlupload/upload_xml.py | 2 +- src/dsp_tools/utils/{logging.py => create_logger.py} | 0 src/dsp_tools/utils/id2iri.py | 2 +- src/dsp_tools/utils/project_create.py | 2 +- src/dsp_tools/utils/project_create_lists.py | 2 +- src/dsp_tools/utils/shared.py | 2 +- src/dsp_tools/utils/stack_handling.py | 2 +- src/dsp_tools/utils/xml_upload.py | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename src/dsp_tools/utils/{logging.py => create_logger.py} (100%) diff --git a/src/dsp_tools/cli.py b/src/dsp_tools/cli.py index 4bb4656ee..14573d272 100644 --- a/src/dsp_tools/cli.py +++ b/src/dsp_tools/cli.py @@ -13,13 +13,13 @@ from dsp_tools.fast_xmlupload.upload_files import upload_files from dsp_tools.fast_xmlupload.upload_xml import fast_xmlupload from dsp_tools.models.exceptions import UserError +from dsp_tools.utils.create_logger import get_logger from dsp_tools.utils.excel2json.lists import excel2lists, validate_lists_section_with_schema from dsp_tools.utils.excel2json.project import excel2json from dsp_tools.utils.excel2json.properties import excel2properties from dsp_tools.utils.excel2json.resources import excel2resources from dsp_tools.utils.generate_templates import generate_template_repo from dsp_tools.utils.id2iri import id2iri -from dsp_tools.utils.logging import get_logger from dsp_tools.utils.project_create import create_project from dsp_tools.utils.project_create_lists import create_lists from dsp_tools.utils.project_get import get_project diff --git a/src/dsp_tools/fast_xmlupload/process_files.py b/src/dsp_tools/fast_xmlupload/process_files.py index 7649d1de4..e6222c56d 100644 --- a/src/dsp_tools/fast_xmlupload/process_files.py +++ b/src/dsp_tools/fast_xmlupload/process_files.py @@ -18,7 +18,7 @@ from lxml import etree from dsp_tools.models.exceptions import UserError -from dsp_tools.utils.logging import get_logger +from dsp_tools.utils.create_logger import get_logger from dsp_tools.utils.shared import http_call_with_retry, make_chunks logger = get_logger(__name__, filesize_mb=100, backupcount=36) diff --git a/src/dsp_tools/fast_xmlupload/upload_files.py b/src/dsp_tools/fast_xmlupload/upload_files.py index 2f6ecc1aa..e2b19f2e8 100644 --- a/src/dsp_tools/fast_xmlupload/upload_files.py +++ b/src/dsp_tools/fast_xmlupload/upload_files.py @@ -11,7 +11,7 @@ from dsp_tools.models.connection import Connection from dsp_tools.models.exceptions import UserError -from dsp_tools.utils.logging import get_logger +from dsp_tools.utils.create_logger import get_logger from dsp_tools.utils.shared import login logger = get_logger(__name__) diff --git a/src/dsp_tools/fast_xmlupload/upload_xml.py b/src/dsp_tools/fast_xmlupload/upload_xml.py index 3f927bca0..c3cd73af1 100644 --- a/src/dsp_tools/fast_xmlupload/upload_xml.py +++ b/src/dsp_tools/fast_xmlupload/upload_xml.py @@ -7,7 +7,7 @@ from dsp_tools.fast_xmlupload.upload_files import get_pkl_files from dsp_tools.models.exceptions import UserError -from dsp_tools.utils.logging import get_logger +from dsp_tools.utils.create_logger import get_logger from dsp_tools.utils.xml_upload import xml_upload logger = get_logger(__name__) diff --git a/src/dsp_tools/utils/logging.py b/src/dsp_tools/utils/create_logger.py similarity index 100% rename from src/dsp_tools/utils/logging.py rename to src/dsp_tools/utils/create_logger.py diff --git a/src/dsp_tools/utils/id2iri.py b/src/dsp_tools/utils/id2iri.py index dad5110ca..f70ea1e88 100644 --- a/src/dsp_tools/utils/id2iri.py +++ b/src/dsp_tools/utils/id2iri.py @@ -6,7 +6,7 @@ from lxml import etree from dsp_tools.models.exceptions import UserError -from dsp_tools.utils.logging import get_logger +from dsp_tools.utils.create_logger import get_logger from dsp_tools.utils.xml_upload import parse_xml_file logger = get_logger(__name__) diff --git a/src/dsp_tools/utils/project_create.py b/src/dsp_tools/utils/project_create.py index e5e5f5603..6af91db48 100644 --- a/src/dsp_tools/utils/project_create.py +++ b/src/dsp_tools/utils/project_create.py @@ -15,8 +15,8 @@ from dsp_tools.models.propertyclass import PropertyClass from dsp_tools.models.resourceclass import ResourceClass from dsp_tools.models.user import User +from dsp_tools.utils.create_logger import get_logger from dsp_tools.utils.excel2json.lists import expand_lists_from_excel -from dsp_tools.utils.logging import get_logger from dsp_tools.utils.project_create_lists import create_lists_on_server from dsp_tools.utils.project_validate import validate_project from dsp_tools.utils.shared import login, parse_json_input, try_network_action diff --git a/src/dsp_tools/utils/project_create_lists.py b/src/dsp_tools/utils/project_create_lists.py index b1e13b534..505ce4fb6 100644 --- a/src/dsp_tools/utils/project_create_lists.py +++ b/src/dsp_tools/utils/project_create_lists.py @@ -4,8 +4,8 @@ from dsp_tools.models.exceptions import BaseError, UserError from dsp_tools.models.listnode import ListNode from dsp_tools.models.project import Project +from dsp_tools.utils.create_logger import get_logger from dsp_tools.utils.excel2json.lists import expand_lists_from_excel -from dsp_tools.utils.logging import get_logger from dsp_tools.utils.project_validate import validate_project from dsp_tools.utils.shared import login, parse_json_input, try_network_action diff --git a/src/dsp_tools/utils/shared.py b/src/dsp_tools/utils/shared.py index 3dad9a5be..422c2ceb5 100644 --- a/src/dsp_tools/utils/shared.py +++ b/src/dsp_tools/utils/shared.py @@ -20,7 +20,7 @@ from dsp_tools.models.connection import Connection from dsp_tools.models.exceptions import BaseError, UserError from dsp_tools.models.propertyelement import PropertyElement -from dsp_tools.utils.logging import get_logger +from dsp_tools.utils.create_logger import get_logger logger = get_logger(__name__) diff --git a/src/dsp_tools/utils/stack_handling.py b/src/dsp_tools/utils/stack_handling.py index 1ebd6c48e..4547f5a90 100644 --- a/src/dsp_tools/utils/stack_handling.py +++ b/src/dsp_tools/utils/stack_handling.py @@ -11,7 +11,7 @@ import yaml from dsp_tools.models.exceptions import UserError -from dsp_tools.utils.logging import get_logger +from dsp_tools.utils.create_logger import get_logger from dsp_tools.utils.shared import http_call_with_retry logger = get_logger(__name__) diff --git a/src/dsp_tools/utils/xml_upload.py b/src/dsp_tools/utils/xml_upload.py index 100ef2d40..063b53e26 100644 --- a/src/dsp_tools/utils/xml_upload.py +++ b/src/dsp_tools/utils/xml_upload.py @@ -29,7 +29,7 @@ from dsp_tools.models.xmlpermission import XmlPermission from dsp_tools.models.xmlproperty import XMLProperty from dsp_tools.models.xmlresource import XMLResource -from dsp_tools.utils.logging import get_logger +from dsp_tools.utils.create_logger import get_logger from dsp_tools.utils.shared import login, try_network_action, validate_xml_against_schema MetricRecord = namedtuple("MetricRecord", ["res_id", "filetype", "filesize_mb", "event", "duration_ms", "mb_per_sec"])