From 1f63f52b3f796d92bcf2570cb65598d35c25b93c Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Thu, 12 Aug 2021 12:10:11 +0200
Subject: [PATCH] Minor improvements in package import
---
src/common/database/Factory.py | 6 +++---
src/common/database/api/entity/EntityAttributes.py | 6 +++---
src/common/database/api/entity/EntityCollection.py | 6 +++---
.../database/engines/inmemory/InMemoryDatabaseEngine.py | 2 +-
src/common/database/engines/redis/RedisDatabaseEngine.py | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/common/database/Factory.py b/src/common/database/Factory.py
index 4b46ed0b1..27dec5818 100644
--- a/src/common/database/Factory.py
+++ b/src/common/database/Factory.py
@@ -1,8 +1,8 @@
import logging, os
from enum import Enum
-from .api.Database import Database
-from .engines.inmemory.InMemoryDatabaseEngine import InMemoryDatabaseEngine
-from .engines.redis.RedisDatabaseEngine import RedisDatabaseEngine
+from common.database.api.Database import Database
+from common.database.engines.inmemory.InMemoryDatabaseEngine import InMemoryDatabaseEngine
+from common.database.engines.redis.RedisDatabaseEngine import RedisDatabaseEngine
LOGGER = logging.getLogger(__name__)
diff --git a/src/common/database/api/entity/EntityAttributes.py b/src/common/database/api/entity/EntityAttributes.py
index 47642b823..b3e553453 100644
--- a/src/common/database/api/entity/EntityAttributes.py
+++ b/src/common/database/api/entity/EntityAttributes.py
@@ -1,11 +1,11 @@
from __future__ import annotations
import copy
from typing import Any, Dict, TYPE_CHECKING
-from ...engines._DatabaseEngine import _DatabaseEngine
-from .Tools import format_key
+from common.database.engines._DatabaseEngine import _DatabaseEngine
+from common.database.api.entity.Tools import format_key
if TYPE_CHECKING:
- from ._Entity import _Entity
+ from common.database.api.entity._Entity import _Entity
class EntityAttributes:
def __init__(self, parent : '_Entity', entity_key : str, validators : Dict, transcoders : Dict = {}):
diff --git a/src/common/database/api/entity/EntityCollection.py b/src/common/database/api/entity/EntityCollection.py
index 4f3ffae04..ed155370b 100644
--- a/src/common/database/api/entity/EntityCollection.py
+++ b/src/common/database/api/entity/EntityCollection.py
@@ -1,10 +1,10 @@
from __future__ import annotations
from typing import TYPE_CHECKING
-from ...engines._DatabaseEngine import _DatabaseEngine
-from .Tools import format_key
+from common.database.engines._DatabaseEngine import _DatabaseEngine
+from common.database.api.entity.Tools import format_key
if TYPE_CHECKING:
- from ._Entity import _Entity
+ from common.database.api.entity._Entity import _Entity
class EntityCollection:
def __init__(self, parent : '_Entity', entity_key : str):
diff --git a/src/common/database/engines/inmemory/InMemoryDatabaseEngine.py b/src/common/database/engines/inmemory/InMemoryDatabaseEngine.py
index ba828d79e..80c1669c7 100644
--- a/src/common/database/engines/inmemory/InMemoryDatabaseEngine.py
+++ b/src/common/database/engines/inmemory/InMemoryDatabaseEngine.py
@@ -1,6 +1,6 @@
import copy, logging, threading, uuid
from typing import Dict, List, Set, Tuple, Union
-from .._DatabaseEngine import _DatabaseEngine
+from common.database.engines._DatabaseEngine import _DatabaseEngine
LOGGER = logging.getLogger(__name__)
diff --git a/src/common/database/engines/redis/RedisDatabaseEngine.py b/src/common/database/engines/redis/RedisDatabaseEngine.py
index e87777968..4e7e07104 100644
--- a/src/common/database/engines/redis/RedisDatabaseEngine.py
+++ b/src/common/database/engines/redis/RedisDatabaseEngine.py
@@ -1,8 +1,8 @@
import os, uuid
from typing import Dict, List, Set, Tuple
from redis.client import Redis
-from .._DatabaseEngine import _DatabaseEngine
-from .Mutex import Mutex
+from common.database.engines._DatabaseEngine import _DatabaseEngine
+from common.database.engines.redis.Mutex import Mutex
KEY_ENTIRE_DATABASE_LOCK = 'everything'
--
GitLab