From 5848174ad4c8eeb267fb013271f50f5380d3a8ca Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 20 Mar 2019 09:13:38 +0100 Subject: [PATCH] Move PrintInformation into cura.UI module --- cura/CuraApplication.py | 3 +-- cura/{ => UI}/PrintInformation.py | 5 +---- tests/TestPrintInformation.py | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) rename cura/{ => UI}/PrintInformation.py (99%) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 07a2e97a64..165a2a4feb 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -92,10 +92,9 @@ from .AutoSave import AutoSave from . import PlatformPhysics from . import BuildVolume from . import CameraAnimation -from . import PrintInformation from . import CuraActions from cura.Scene import ZOffsetDecorator -from cura.UI import CuraSplashScreen, MachineActionManager +from cura.UI import CuraSplashScreen, MachineActionManager, PrintInformation from . import PrintJobPreviewImageProvider from cura.TaskManagement.OnExitCallbackManager import OnExitCallbackManager diff --git a/cura/PrintInformation.py b/cura/UI/PrintInformation.py similarity index 99% rename from cura/PrintInformation.py rename to cura/UI/PrintInformation.py index ba7c74fd6d..2122abbe82 100644 --- a/cura/PrintInformation.py +++ b/cura/UI/PrintInformation.py @@ -5,8 +5,7 @@ import json import math import os import unicodedata -import re # To create abbreviations for printer names. -from typing import Dict, List, Optional +from typing import Dict, List, Optional, TYPE_CHECKING from PyQt5.QtCore import QObject, pyqtSignal, pyqtProperty, pyqtSlot @@ -16,8 +15,6 @@ from UM.Scene.SceneNode import SceneNode from UM.i18n import i18nCatalog from UM.MimeTypeDatabase import MimeTypeDatabase, MimeTypeNotFoundError -from typing import TYPE_CHECKING - if TYPE_CHECKING: from cura.CuraApplication import CuraApplication diff --git a/tests/TestPrintInformation.py b/tests/TestPrintInformation.py index 177643bc90..66af734d89 100644 --- a/tests/TestPrintInformation.py +++ b/tests/TestPrintInformation.py @@ -1,7 +1,7 @@ import functools from UM.Qt.Duration import Duration -from cura import PrintInformation +from cura.UI import PrintInformation from cura.Settings.MachineManager import MachineManager from unittest.mock import MagicMock, patch