From b39c3ab4255d040ca5ff77c472f59cf7f3bc3850 Mon Sep 17 00:00:00 2001 From: ThePromidius Date: Wed, 28 Feb 2024 14:50:35 +0100 Subject: [PATCH] moved LoadedComicInfo into its own module in package --- .../Extensions/WebpConverter/WebpConverter.py | 3 +-- .../LoadedComicInfo/ArchiveFile.py | 0 .../LoadedComicInfo/CoverActions.py | 0 .../LoadedComicInfo/ILoadedComicInfo.py | 0 .../LoadedComicInfo/LoadedComicInfo.py | 2 +- .../LoadedComicInfo/LoadedFileCoverData.py | 2 +- .../LoadedComicInfo/LoadedFileMetadata.py | 2 +- .../{Common => }/LoadedComicInfo/__init__.py | 0 .../CoverManager/CoverManager.py | 4 +--- .../MetadataManager/GUI/ExceptionWindow.py | 2 +- .../GUI/widgets/CanvasCoverWidget.py | 5 ++--- .../GUI/widgets/FileMultiSelectWidget.py | 2 +- .../GUI/windows/SettingsWindow.py | 4 ++-- .../MetadataManager/MetadataManagerCLI.py | 2 +- .../MetadataManager/MetadataManagerGUI.py | 4 ++-- .../MetadataManager/MetadataManagerLib.py | 2 +- .../tests/LoadedComicInfo/test_Covers.py | 2 +- .../tests/LoadedComicInfo/test_LoadedCInfo.py | 2 +- .../LoadedComicInfo/test_LoadedCInfo_backup.py | 1 - .../tests/LoadedComicInfo/test_moveto.py | 2 +- .../GUI/test_MetadataEditorGUI.py | 2 +- .../test_MetadataEditorCore.py | 18 +++++++++--------- MangaManager/tests/common.py | 2 +- MangaManager/tests/data/test.py | 2 +- 24 files changed, 30 insertions(+), 35 deletions(-) rename MangaManager/MangaManager/{Common => }/LoadedComicInfo/ArchiveFile.py (100%) rename MangaManager/MangaManager/{Common => }/LoadedComicInfo/CoverActions.py (100%) rename MangaManager/MangaManager/{Common => }/LoadedComicInfo/ILoadedComicInfo.py (100%) rename MangaManager/MangaManager/{Common => }/LoadedComicInfo/LoadedComicInfo.py (99%) rename MangaManager/MangaManager/{Common => }/LoadedComicInfo/LoadedFileCoverData.py (99%) rename MangaManager/MangaManager/{Common => }/LoadedComicInfo/LoadedFileMetadata.py (97%) rename MangaManager/MangaManager/{Common => }/LoadedComicInfo/__init__.py (100%) diff --git a/MangaManager/Extensions/WebpConverter/WebpConverter.py b/MangaManager/Extensions/WebpConverter/WebpConverter.py index 9f0bd435..ba313234 100644 --- a/MangaManager/Extensions/WebpConverter/WebpConverter.py +++ b/MangaManager/Extensions/WebpConverter/WebpConverter.py @@ -4,14 +4,13 @@ import logging import os import pathlib -import threading import tkinter import tkinter.ttk as ttk from concurrent.futures import ProcessPoolExecutor from tkinter import filedialog from Extensions.IExtensionApp import IExtensionApp -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo from MangaManager.Common.utils import ShowPathTreeAsDict from MangaManager.MetadataManager.GUI.widgets import ScrolledFrameWidget, ProgressBarWidget from MangaManager.Settings.Settings import Settings diff --git a/MangaManager/MangaManager/Common/LoadedComicInfo/ArchiveFile.py b/MangaManager/MangaManager/LoadedComicInfo/ArchiveFile.py similarity index 100% rename from MangaManager/MangaManager/Common/LoadedComicInfo/ArchiveFile.py rename to MangaManager/MangaManager/LoadedComicInfo/ArchiveFile.py diff --git a/MangaManager/MangaManager/Common/LoadedComicInfo/CoverActions.py b/MangaManager/MangaManager/LoadedComicInfo/CoverActions.py similarity index 100% rename from MangaManager/MangaManager/Common/LoadedComicInfo/CoverActions.py rename to MangaManager/MangaManager/LoadedComicInfo/CoverActions.py diff --git a/MangaManager/MangaManager/Common/LoadedComicInfo/ILoadedComicInfo.py b/MangaManager/MangaManager/LoadedComicInfo/ILoadedComicInfo.py similarity index 100% rename from MangaManager/MangaManager/Common/LoadedComicInfo/ILoadedComicInfo.py rename to MangaManager/MangaManager/LoadedComicInfo/ILoadedComicInfo.py diff --git a/MangaManager/MangaManager/Common/LoadedComicInfo/LoadedComicInfo.py b/MangaManager/MangaManager/LoadedComicInfo/LoadedComicInfo.py similarity index 99% rename from MangaManager/MangaManager/Common/LoadedComicInfo/LoadedComicInfo.py rename to MangaManager/MangaManager/LoadedComicInfo/LoadedComicInfo.py index e3ca74bc..6686533e 100644 --- a/MangaManager/MangaManager/Common/LoadedComicInfo/LoadedComicInfo.py +++ b/MangaManager/MangaManager/LoadedComicInfo/LoadedComicInfo.py @@ -16,7 +16,7 @@ from .ILoadedComicInfo import ILoadedComicInfo from .LoadedFileCoverData import LoadedFileCoverData from .LoadedFileMetadata import LoadedFileMetadata -from ...Settings import Settings, SettingHeading +from MangaManager.Settings import Settings, SettingHeading logger = logging.getLogger("LoadedCInfo") COMICINFO_FILE = 'ComicInfo.xml' diff --git a/MangaManager/MangaManager/Common/LoadedComicInfo/LoadedFileCoverData.py b/MangaManager/MangaManager/LoadedComicInfo/LoadedFileCoverData.py similarity index 99% rename from MangaManager/MangaManager/Common/LoadedComicInfo/LoadedFileCoverData.py rename to MangaManager/MangaManager/LoadedComicInfo/LoadedFileCoverData.py index f38a2793..01ea5233 100644 --- a/MangaManager/MangaManager/Common/LoadedComicInfo/LoadedFileCoverData.py +++ b/MangaManager/MangaManager/LoadedComicInfo/LoadedFileCoverData.py @@ -12,7 +12,7 @@ from .ArchiveFile import ArchiveFile from .CoverActions import CoverActions from .ILoadedComicInfo import ILoadedComicInfo -from ...Settings import Settings, SettingHeading +from MangaManager.Settings import Settings, SettingHeading logger = logging.getLogger("LoadedCInfo") COMICINFO_FILE = 'ComicInfo.xml' diff --git a/MangaManager/MangaManager/Common/LoadedComicInfo/LoadedFileMetadata.py b/MangaManager/MangaManager/LoadedComicInfo/LoadedFileMetadata.py similarity index 97% rename from MangaManager/MangaManager/Common/LoadedComicInfo/LoadedFileMetadata.py rename to MangaManager/MangaManager/LoadedComicInfo/LoadedFileMetadata.py index b6d322b7..fa091531 100644 --- a/MangaManager/MangaManager/Common/LoadedComicInfo/LoadedFileMetadata.py +++ b/MangaManager/MangaManager/LoadedComicInfo/LoadedFileMetadata.py @@ -5,7 +5,7 @@ from lxml.etree import XMLSyntaxError from ComicInfo import ComicInfo -from MangaManager.Common.LoadedComicInfo.ILoadedComicInfo import ILoadedComicInfo +from MangaManager.LoadedComicInfo.ILoadedComicInfo import ILoadedComicInfo from MangaManager.Common.errors import MissingRarTool logger = logging.getLogger("LoadedCInfo") diff --git a/MangaManager/MangaManager/Common/LoadedComicInfo/__init__.py b/MangaManager/MangaManager/LoadedComicInfo/__init__.py similarity index 100% rename from MangaManager/MangaManager/Common/LoadedComicInfo/__init__.py rename to MangaManager/MangaManager/LoadedComicInfo/__init__.py diff --git a/MangaManager/MangaManager/MetadataManager/CoverManager/CoverManager.py b/MangaManager/MangaManager/MetadataManager/CoverManager/CoverManager.py index 36133052..5a3ccfd1 100644 --- a/MangaManager/MangaManager/MetadataManager/CoverManager/CoverManager.py +++ b/MangaManager/MangaManager/MetadataManager/CoverManager/CoverManager.py @@ -10,14 +10,12 @@ from PIL import Image, ImageTk from MangaManager.Common import ResourceLoader -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import CoverActions, LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import CoverActions, LoadedComicInfo from MangaManager.MetadataManager.CoverManager import torchlib -from MangaManager.MetadataManager.GUI import MessageBox from MangaManager.MetadataManager.GUI.MessageBox import MessageBoxWidgetFactory as mb from MangaManager.MetadataManager.GUI.scrolledframe import ScrolledFrame from MangaManager.MetadataManager.GUI.widgets import ButtonWidget from MangaManager.MetadataManager.GUI.widgets.CanvasCoverWidget import CoverFrame, CanvasCoverWidget -from MangaManager.MetadataManager.GUI.widgets.MessageBoxWidget import MessageBoxWidget, MessageBoxButton from MangaManager.MetadataManager.GUI.windows.LoadingWindow import LoadingWindow from MangaManager.MetadataManager.MetadataManagerGUI import GUIApp from MangaManager.Settings import SettingHeading diff --git a/MangaManager/MangaManager/MetadataManager/GUI/ExceptionWindow.py b/MangaManager/MangaManager/MetadataManager/GUI/ExceptionWindow.py index ffd48163..e8970066 100644 --- a/MangaManager/MangaManager/MetadataManager/GUI/ExceptionWindow.py +++ b/MangaManager/MangaManager/MetadataManager/GUI/ExceptionWindow.py @@ -5,7 +5,7 @@ from tkinter.font import Font from tkinter.ttk import Treeview, Style -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo logger = logging.getLogger() diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/CanvasCoverWidget.py b/MangaManager/MangaManager/MetadataManager/GUI/widgets/CanvasCoverWidget.py index 5c1f2566..8f33d239 100644 --- a/MangaManager/MangaManager/MetadataManager/GUI/widgets/CanvasCoverWidget.py +++ b/MangaManager/MangaManager/MetadataManager/GUI/widgets/CanvasCoverWidget.py @@ -1,6 +1,5 @@ import logging import pathlib -import tkinter from idlelib.tooltip import Hovertip from os.path import basename from tkinter import Frame, Label, StringVar, Event, Canvas, NW, CENTER, Button @@ -10,8 +9,8 @@ from PIL import Image, ImageTk from MangaManager.Common import ResourceLoader -from MangaManager.Common.LoadedComicInfo.CoverActions import CoverActions -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo +from MangaManager.LoadedComicInfo.CoverActions import CoverActions +from MangaManager.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo from MangaManager.Settings import SettingHeading from MangaManager.Settings.Settings import Settings diff --git a/MangaManager/MangaManager/MetadataManager/GUI/widgets/FileMultiSelectWidget.py b/MangaManager/MangaManager/MetadataManager/GUI/widgets/FileMultiSelectWidget.py index 64d7e171..e8c9ac1d 100644 --- a/MangaManager/MangaManager/MetadataManager/GUI/widgets/FileMultiSelectWidget.py +++ b/MangaManager/MangaManager/MetadataManager/GUI/widgets/FileMultiSelectWidget.py @@ -3,7 +3,7 @@ import tkinter from tkinter.ttk import Treeview -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo logger = logging.getLogger() diff --git a/MangaManager/MangaManager/MetadataManager/GUI/windows/SettingsWindow.py b/MangaManager/MangaManager/MetadataManager/GUI/windows/SettingsWindow.py index 0d2eff4c..cc91e77b 100644 --- a/MangaManager/MangaManager/MetadataManager/GUI/windows/SettingsWindow.py +++ b/MangaManager/MangaManager/MetadataManager/GUI/windows/SettingsWindow.py @@ -4,12 +4,12 @@ import re import tkinter from tkinter import ttk, Frame -from tkinter.ttk import LabelFrame, Label, Notebook, Combobox +from tkinter.ttk import LabelFrame, Notebook, Combobox from ExternalSources.MetadataSources import ScraperFactory from ComicInfo import ComicInfo from MangaManager import MM_PATH -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo from MangaManager.Common.utils import open_folder from MangaManager.DynamicLibController.models import IMetadataSource from MangaManager.MetadataManager.GUI.utils import center diff --git a/MangaManager/MangaManager/MetadataManager/MetadataManagerCLI.py b/MangaManager/MangaManager/MetadataManager/MetadataManagerCLI.py index afb96658..d4216c7f 100644 --- a/MangaManager/MangaManager/MetadataManager/MetadataManagerCLI.py +++ b/MangaManager/MangaManager/MetadataManager/MetadataManagerCLI.py @@ -13,7 +13,7 @@ from prompt_toolkit.validation import Validator from ComicInfo import ComicInfo -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo from MangaManager.Common.utils import ShowPathTreeAsDict from MangaManager.MetadataManager.MetadataManagerLib import MetadataManagerLib diff --git a/MangaManager/MangaManager/MetadataManager/MetadataManagerGUI.py b/MangaManager/MangaManager/MetadataManager/MetadataManagerGUI.py index b3dc4a4d..33fc758e 100644 --- a/MangaManager/MangaManager/MetadataManager/MetadataManagerGUI.py +++ b/MangaManager/MangaManager/MetadataManager/MetadataManagerGUI.py @@ -4,7 +4,7 @@ import logging import os import tkinter -from tkinter import Tk, Frame +from tkinter import Frame from ComicInfo import ComicInfo from MangaManager.Common import ResourceLoader @@ -23,7 +23,7 @@ from tkinter.filedialog import askopenfiles, askdirectory from _tkinter import TclError from tkinterdnd2.TkinterDnD import Tk -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo from MangaManager.MetadataManager.GUI.widgets import ComboBoxWidget, OptionMenuWidget, WidgetManager, ButtonWidget from MangaManager.MetadataManager.GUI.windows.SettingsWindow import SettingsWindow from MangaManager.MetadataManager.MetadataManagerLib import MetadataManagerLib diff --git a/MangaManager/MangaManager/MetadataManager/MetadataManagerLib.py b/MangaManager/MangaManager/MetadataManager/MetadataManagerLib.py index e40c7f2e..e0af5e64 100644 --- a/MangaManager/MangaManager/MetadataManager/MetadataManagerLib.py +++ b/MangaManager/MangaManager/MetadataManager/MetadataManagerLib.py @@ -6,7 +6,7 @@ from ExternalSources.MetadataSources import ScraperFactory from ComicInfo import ComicInfo -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo from MangaManager.Common.errors import EditedCinfoNotSet, MangaNotFoundError, MissingRarTool from MangaManager.Common.errors import NoComicInfoLoaded, CorruptedComicInfo, BadZipFile from MangaManager.Common.terminalcolors import TerminalColors as TerCol diff --git a/MangaManager/tests/LoadedComicInfo/test_Covers.py b/MangaManager/tests/LoadedComicInfo/test_Covers.py index e518ca7e..cd440fdb 100644 --- a/MangaManager/tests/LoadedComicInfo/test_Covers.py +++ b/MangaManager/tests/LoadedComicInfo/test_Covers.py @@ -4,7 +4,7 @@ from PIL import Image -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import CoverActions, LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import CoverActions, LoadedComicInfo from MangaManager.Common.utils import obtain_cover_filename from tests.common import CBZManipulationTests, create_test_cbz diff --git a/MangaManager/tests/LoadedComicInfo/test_LoadedCInfo.py b/MangaManager/tests/LoadedComicInfo/test_LoadedCInfo.py index 447d7d28..a651dd89 100644 --- a/MangaManager/tests/LoadedComicInfo/test_LoadedCInfo.py +++ b/MangaManager/tests/LoadedComicInfo/test_LoadedCInfo.py @@ -6,7 +6,7 @@ from unittest import skip from ComicInfo import ComicInfo -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo TEST_COMIC_INFO_STRING = """ diff --git a/MangaManager/tests/LoadedComicInfo/test_LoadedCInfo_backup.py b/MangaManager/tests/LoadedComicInfo/test_LoadedCInfo_backup.py index 0817c594..14c9fcab 100644 --- a/MangaManager/tests/LoadedComicInfo/test_LoadedCInfo_backup.py +++ b/MangaManager/tests/LoadedComicInfo/test_LoadedCInfo_backup.py @@ -5,7 +5,6 @@ import zipfile from ComicInfo import ComicInfo -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo from MangaManager.Settings import Settings, SettingHeading TEST_COMIC_INFO_STRING = """ diff --git a/MangaManager/tests/LoadedComicInfo/test_moveto.py b/MangaManager/tests/LoadedComicInfo/test_moveto.py index 34db8e74..fc64a131 100644 --- a/MangaManager/tests/LoadedComicInfo/test_moveto.py +++ b/MangaManager/tests/LoadedComicInfo/test_moveto.py @@ -1,7 +1,7 @@ import unittest from ComicInfo import ComicInfo -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo class MoveToTemplate(unittest.TestCase): diff --git a/MangaManager/tests/MetadataManagerTests/GUI/test_MetadataEditorGUI.py b/MangaManager/tests/MetadataManagerTests/GUI/test_MetadataEditorGUI.py index 218c7f14..81939427 100644 --- a/MangaManager/tests/MetadataManagerTests/GUI/test_MetadataEditorGUI.py +++ b/MangaManager/tests/MetadataManagerTests/GUI/test_MetadataEditorGUI.py @@ -6,7 +6,7 @@ from ComicInfo import ComicInfo from logging_setup import add_trace_level -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo from MangaManager.MetadataManager import MetadataManagerGUI from MangaManager.MetadataManager.MetadataManagerLib import MetadataManagerLib from tests.common import create_dummy_files, TKinterTestCase, parameterized_class, create_test_cbz diff --git a/MangaManager/tests/MetadataManagerTests/test_MetadataEditorCore.py b/MangaManager/tests/MetadataManagerTests/test_MetadataEditorCore.py index 15900a07..08f29965 100644 --- a/MangaManager/tests/MetadataManagerTests/test_MetadataEditorCore.py +++ b/MangaManager/tests/MetadataManagerTests/test_MetadataEditorCore.py @@ -3,10 +3,10 @@ import zipfile from unittest.mock import patch, MagicMock -import MangaManager.Common.LoadedComicInfo.LoadedComicInfo +import MangaManager.LoadedComicInfo.LoadedComicInfo from ComicInfo import ComicInfo from logging_setup import add_trace_level -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import LoadedComicInfo from MangaManager.Common.errors import CorruptedComicInfo, NoComicInfoLoaded from MangaManager.Common.errors import EditedCinfoNotSet, BadZipFile from MangaManager.MetadataManager import MetadataManagerLib @@ -27,7 +27,7 @@ def setUp(self) -> None: def tearDown(self) -> None: # Some cases patch LoadedComicInfo. patchin back just in case - MangaManager.Common.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = LoadedComicInfo + MangaManager.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = LoadedComicInfo print("Teardown:") for filename in self.test_files_names: print(f" Deleting: {filename}") # , self._testMethodName) @@ -117,7 +117,7 @@ def setUp(self) -> None: def tearDown(self) -> None: # Some cases patch LoadedComicInfo. patchin back just in case - MangaManager.Common.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = LoadedComicInfo + MangaManager.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = LoadedComicInfo print("Teardown:") for filename in self.test_files_names: print(f" Deleting: {filename}") # , self._testMethodName) @@ -137,7 +137,7 @@ def raise_badzip(*_, **__): raise BadZipFile() RaiseBadZip.__init__ = raise_badzip - MangaManager.Common.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = RaiseBadZip + MangaManager.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = RaiseBadZip self.instance.selected_files_path = self.test_files_names = create_dummy_files(2) @@ -156,11 +156,11 @@ class RaiseCorruptedMeta: def raise_badzip(*_, **__): # Exception raised but then we create a new object with a brand new comicinfo. # Fix back patched class and raise exception - MangaManager.Common.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = LoadedComicInfo + MangaManager.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = LoadedComicInfo raise CorruptedComicInfo("") RaiseCorruptedMeta.__init__ = raise_badzip - MangaManager.Common.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = RaiseCorruptedMeta + MangaManager.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = RaiseCorruptedMeta self.instance.selected_files_path = self.test_files_names = create_dummy_files(2) @@ -184,7 +184,7 @@ def write_metadata(self, auto_unmark_changes=False): super().write_metadata(auto_unmark_changes) - MangaManager.Common.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = RaisePermissionError + MangaManager.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = RaisePermissionError self.instance.selected_files_path = self.test_files_names = create_dummy_files(2) self.instance.loaded_cinfo_list = [RaisePermissionError(path) for path in self.test_files_names] @@ -205,7 +205,7 @@ def __init__(self, *args, **kwargs): def write_metadata(self, auto_unmark_changes=False): raise Exception("Exception. This exception is raised as part of one unit test. Safe to ignore") - MangaManager.Common.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = RaisePermissionError + MangaManager.LoadedComicInfo.LoadedComicInfo.LoadedComicInfo = RaisePermissionError self.instance.selected_files_path = self.test_files_names = create_dummy_files(2) self.instance.loaded_cinfo_list = [RaisePermissionError(path) for path in self.test_files_names] diff --git a/MangaManager/tests/common.py b/MangaManager/tests/common.py index 73b20f6d..7c8a1e14 100644 --- a/MangaManager/tests/common.py +++ b/MangaManager/tests/common.py @@ -11,7 +11,7 @@ from PIL import Image from lxml import etree -from MangaManager.Common.LoadedComicInfo.LoadedComicInfo import COMICINFO_FILE, LoadedComicInfo +from MangaManager.LoadedComicInfo.LoadedComicInfo import COMICINFO_FILE, LoadedComicInfo def create_dummy_files(nfiles): diff --git a/MangaManager/tests/data/test.py b/MangaManager/tests/data/test.py index 3d0fb866..733a0d58 100644 --- a/MangaManager/tests/data/test.py +++ b/MangaManager/tests/data/test.py @@ -1,4 +1,4 @@ -from MangaManager.Common.LoadedComicInfo.ArchiveFile import ArchiveFile +from MangaManager.LoadedComicInfo.ArchiveFile import ArchiveFile if __name__ == '__main__': with ArchiveFile("!00_SAMPLE_FILE.rar", "r") as rfile: