From 8d6c237c38288bbb75a9d83516640f7877279f48 Mon Sep 17 00:00:00 2001 From: Javinator9889 Date: Fri, 21 Aug 2020 10:38:26 +0200 Subject: [PATCH] Solved an ImportError --- YouTubeMDBot/__init__.py | 1 + YouTubeMDBot/database/__init__.py | 16 ++++++++-------- YouTubeMDBot/database/redis/wrapper.py | 5 +++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/YouTubeMDBot/__init__.py b/YouTubeMDBot/__init__.py index 5e084d4..87e63d2 100755 --- a/YouTubeMDBot/__init__.py +++ b/YouTubeMDBot/__init__.py @@ -50,6 +50,7 @@ from .database import YouTubeStatsDB from .database import FileDB from .database import UserDB +from .database.redis import DatabaseWrapper from .downloader import YouTubeDownloader from .downloader import MultipleYouTubeDownloader diff --git a/YouTubeMDBot/database/__init__.py b/YouTubeMDBot/database/__init__.py index cb93a8a..925d523 100644 --- a/YouTubeMDBot/database/__init__.py +++ b/YouTubeMDBot/database/__init__.py @@ -13,16 +13,16 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see . +from ..database.file import FileDB +from ..database.history import HistoryDB +from ..database.metadata import MetadataDB +from ..database.preferences import PreferencesDB from ..database.psql import Initializer from ..database.psql import PostgreSQLBase from ..database.psql import PostgreSQLItem - -from ..database.youtube import YouTubeDB -from ..database.metadata import MetadataDB -from ..database.file import FileDB -from ..database.user import UserDB -from ..database.history import HistoryDB +from ..database.redis import DatabaseWrapper from ..database.stats import YouTubeStatsDB -from ..database.preferences import PreferencesDB +from ..database.user import UserDB +from ..database.youtube import YouTubeDB -from ..database.redis import DatabaseWrapper +from .. import REDIS_UNIX_SOCKET diff --git a/YouTubeMDBot/database/redis/wrapper.py b/YouTubeMDBot/database/redis/wrapper.py index 1851ae0..6802456 100644 --- a/YouTubeMDBot/database/redis/wrapper.py +++ b/YouTubeMDBot/database/redis/wrapper.py @@ -22,8 +22,9 @@ from abc import ABC from typing import Union, Optional from threading import Lock -from database import PostgreSQLItem -from YouTubeMDBot import REDIS_UNIX_SOCKET + +from .. import PostgreSQLItem +from .. import REDIS_UNIX_SOCKET wrapper_lock = Lock()