From 84c3a16782e307833c1059fcd827b69d25b5bcbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Mon, 24 Apr 2023 17:09:06 +0200 Subject: Change imports to relative. A testrun through `gunicorn mu4web.main:app` showed that we could either get it working by setting PYTHONPATH=$PWD/mu4web, or by changing all imports to relative. However, deploying it to the main python path didn't seem to work. Probably since i'm referencing local modules as global. --- mu4web/maildir.py | 4 ++-- mu4web/main.py | 12 ++++++------ mu4web/user/local.py | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/mu4web/maildir.py b/mu4web/maildir.py index 8b01f6d..c2abc16 100644 --- a/mu4web/maildir.py +++ b/mu4web/maildir.py @@ -1,8 +1,8 @@ from dataclasses import dataclass import os.path -from html_render import HTML -from util import find +from .html_render import HTML +from .util import find from urllib.parse import urlencode diff --git a/mu4web/main.py b/mu4web/main.py index 981682a..681041e 100644 --- a/mu4web/main.py +++ b/mu4web/main.py @@ -16,12 +16,12 @@ from typing import ( Optional, cast, ) -from mu import get_mail -import mu -from html_render import HTML, render_document -from user.local import LocalUser -from user.pam import PamUser -from maildir import find_maildirs, serialize_maildir +from .mu import get_mail +from . import mu +from .html_render import HTML, render_document +from .user.local import LocalUser +from .user.pam import PamUser +from .maildir import find_maildirs, serialize_maildir import flask from flask import ( diff --git a/mu4web/user/local.py b/mu4web/user/local.py index 8de3999..37e88cb 100644 --- a/mu4web/user/local.py +++ b/mu4web/user/local.py @@ -1,5 +1,5 @@ -import password -from password import Passwords +from .. import password +from ..password import Passwords from typing import cast import os from . import User -- cgit v1.2.3