From 2a577de45cd215ed34b5d644c3e16800e386458e Mon Sep 17 00:00:00 2001 From: KatKatKateryna Date: Thu, 7 Dec 2023 02:16:39 +0800 Subject: [PATCH] remove imports names overlap --- qt_ui/dockwidget_main.py | 4 ++-- qt_ui/utils/logger.py | 4 ++-- qt_ui/{ => utils}/utils.py | 0 qt_ui/widget_add_stream.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename qt_ui/{ => utils}/utils.py (100%) diff --git a/qt_ui/dockwidget_main.py b/qt_ui/dockwidget_main.py index a8d8037..621e127 100644 --- a/qt_ui/dockwidget_main.py +++ b/qt_ui/dockwidget_main.py @@ -8,7 +8,7 @@ try: from specklepy_qt_ui.qt_ui.widget_transforms import MappingSendDialog from specklepy_qt_ui.qt_ui.LogWidget import LogWidget from specklepy_qt_ui.qt_ui.utils.logger import logToUser - from specklepy_qt_ui.qt_ui.utils import constructCommitURL + from specklepy_qt_ui.qt_ui.utils.utils import constructCommitURL from specklepy_qt_ui.qt_ui.DataStorage import DataStorage from specklepy_qt_ui.qt_ui.utils.global_resources import ( COLOR_HIGHLIGHT, @@ -40,7 +40,7 @@ except ModuleNotFoundError: from speckle.specklepy_qt_ui.qt_ui.widget_transforms import MappingSendDialog from speckle.specklepy_qt_ui.qt_ui.LogWidget import LogWidget from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser - from speckle.specklepy_qt_ui.qt_ui.utils import constructCommitURL + from speckle.specklepy_qt_ui.qt_ui.utils.utils import constructCommitURL from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage from speckle.specklepy_qt_ui.qt_ui.utils.global_resources import ( COLOR_HIGHLIGHT, diff --git a/qt_ui/utils/logger.py b/qt_ui/utils/logger.py index 751e743..134da85 100644 --- a/qt_ui/utils/logger.py +++ b/qt_ui/utils/logger.py @@ -2,9 +2,9 @@ from PyQt5.QtWidgets import QMessageBox from PyQt5 import QtCore try: - from specklepy_qt_ui.qt_ui.utils import splitTextIntoLines + from specklepy_qt_ui.qt_ui.utils.utils import splitTextIntoLines except ModuleNotFoundError: - from speckle.specklepy_qt_ui.qt_ui.utils import splitTextIntoLines + from speckle.specklepy_qt_ui.qt_ui.utils.utils import splitTextIntoLines def logToUser( msg: str, func=None, level: int = 2, plugin=None, url="", blue=False, report=False diff --git a/qt_ui/utils.py b/qt_ui/utils/utils.py similarity index 100% rename from qt_ui/utils.py rename to qt_ui/utils/utils.py diff --git a/qt_ui/widget_add_stream.py b/qt_ui/widget_add_stream.py index 21804d1..8f5425d 100644 --- a/qt_ui/widget_add_stream.py +++ b/qt_ui/widget_add_stream.py @@ -5,11 +5,11 @@ import urllib.parse try: from specklepy_qt_ui.qt_ui.DataStorage import DataStorage from specklepy_qt_ui.qt_ui.utils.logger import logToUser - from specklepy_qt_ui.qt_ui.utils import constructCommitURLfromServerCommit + from specklepy_qt_ui.qt_ui.utils.utils import constructCommitURLfromServerCommit except ModuleNotFoundError: from speckle.specklepy_qt_ui.qt_ui.DataStorage import DataStorage from speckle.specklepy_qt_ui.qt_ui.utils.logger import logToUser - from speckle.specklepy_qt_ui.qt_ui.utils import constructCommitURLfromServerCommit + from speckle.specklepy_qt_ui.qt_ui.utils.utils import constructCommitURLfromServerCommit from PyQt5 import QtWidgets, uic, QtCore from PyQt5.QtCore import pyqtSignal