diff --git a/plinth/modules/email_server/aliases/__init__.py b/plinth/modules/email_server/aliases.py similarity index 90% rename from plinth/modules/email_server/aliases/__init__.py rename to plinth/modules/email_server/aliases.py index dc0340456..0f751f876 100644 --- a/plinth/modules/email_server/aliases/__init__.py +++ b/plinth/modules/email_server/aliases.py @@ -4,10 +4,20 @@ import contextlib import pwd import sqlite3 +from dataclasses import InitVar, dataclass, field from plinth import actions -from . import models + +@dataclass +class Alias: + value: int + name: str + enabled: bool = field(init=False) + status: InitVar[int] + + def __post_init__(self, status): + self.enabled = (status != 0) @contextlib.contextmanager @@ -29,7 +39,7 @@ def get(uid): query = 'SELECT name, value, status FROM alias WHERE value=?' with _get_cursor() as cursor: rows = cursor.execute(query, (uid, )) - return [models.Alias(**row) for row in rows] + return [Alias(**row) for row in rows] def exists(name): diff --git a/plinth/modules/email_server/aliases/models.py b/plinth/modules/email_server/aliases/models.py deleted file mode 100644 index 8cad96a8b..000000000 --- a/plinth/modules/email_server/aliases/models.py +++ /dev/null @@ -1,12 +0,0 @@ -from dataclasses import InitVar, dataclass, field - - -@dataclass -class Alias: - value: int - name: str - enabled: bool = field(init=False) - status: InitVar[int] - - def __post_init__(self, status): - self.enabled = (status != 0)