diff options
author | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-12-01 14:43:10 +0100 |
---|---|---|
committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2022-12-01 14:43:10 +0100 |
commit | 90fd7cac1582cd627ae090b710921c07c54c8c8b (patch) | |
tree | 16dae440068c74c917ccc9982bc8e1938d980ebd /mu4web | |
parent | Force search results to fit inside one line. (diff) | |
download | mu4web-90fd7cac1582cd627ae090b710921c07c54c8c8b.tar.gz mu4web-90fd7cac1582cd627ae090b710921c07c54c8c8b.tar.xz |
Minor cleanups.
Diffstat (limited to 'mu4web')
-rw-r--r-- | mu4web/maildir.py | 7 | ||||
-rw-r--r-- | mu4web/main.py | 6 | ||||
-rw-r--r-- | mu4web/mu.py | 4 | ||||
-rw-r--r-- | mu4web/user/local.py | 1 | ||||
-rw-r--r-- | mu4web/user/pam.py | 1 | ||||
-rw-r--r-- | mu4web/util.py | 1 |
6 files changed, 10 insertions, 10 deletions
diff --git a/mu4web/maildir.py b/mu4web/maildir.py index 831f23d..8b01f6d 100644 --- a/mu4web/maildir.py +++ b/mu4web/maildir.py @@ -15,6 +15,7 @@ try: except ModuleNotFoundError: natsorted = sorted + @dataclass class MaildirEntry: """A single maildir, used by find_maildirs.""" @@ -46,7 +47,6 @@ def _build_tree(items: list[list[str]]) -> MaildirGroup: return node - def find_maildirs(basedir) -> MaildirGroup: """ Find all maildirs located under basedir. @@ -62,7 +62,7 @@ def find_maildirs(basedir) -> MaildirGroup: files = find(basedir, type='d', name='cur') # + 1 removes leading slash # - 4 removes '/cur' - dirs = [entry[len(basedir)+1:-4].decode('UTF-8').split(os.path.sep) + dirs = [entry[len(basedir) + 1:-4].decode('UTF-8').split(os.path.sep) for entry in files] return _build_tree(dirs) @@ -81,8 +81,7 @@ def serialize_maildir(maildir: MaildirGroup, path: list[str] = []) -> HTML: entry = ('li', ('details', ('summary', node.name), - serialize_maildir(node, path + [node.name]))) + serialize_maildir(node, path + [node.name]))) entries.append(entry) return ('ul', *entries) - diff --git a/mu4web/main.py b/mu4web/main.py index f901aec..7b85a06 100644 --- a/mu4web/main.py +++ b/mu4web/main.py @@ -103,9 +103,11 @@ def login_page(returnto: Optional[str] = None) -> HTML: ('label', {'for': 'username'}, 'Användarnamn'), ('input', {'id': 'username', 'name': 'username', 'placeholder': 'Användarnamn'}), ('label', {'for': 'password'}, 'Lösenord'), - ('input', {'id': 'password', 'name': 'password', 'placeholder': 'Lösenord', 'type': 'password',}), + ('input', {'id': 'password', 'name': 'password', + 'placeholder': 'Lösenord', + 'type': 'password'}), ('div', - ('input', {'id': 'remember', 'name': 'remember', 'type': 'checkbox',}), + ('input', {'id': 'remember', 'name': 'remember', 'type': 'checkbox'}), ('label', {'for': 'remember'}, 'Kom ihåg mig')), ('input', {'type': 'hidden', 'name': 'returnto', diff --git a/mu4web/mu.py b/mu4web/mu.py index 0029870..f101245 100644 --- a/mu4web/mu.py +++ b/mu4web/mu.py @@ -11,9 +11,7 @@ import xml.dom.minidom import xml.dom from typing import ( - Literal, Optional, - Union, ) parser = BytesParser(policy=email.policy.default) @@ -62,8 +60,6 @@ class MuError(Exception): return repr(self) - - def search(query: str, sortfield: Optional[str] = 'subject', reverse: bool = False) -> list[dict[str, str]]: diff --git a/mu4web/user/local.py b/mu4web/user/local.py index c4485ce..8de3999 100644 --- a/mu4web/user/local.py +++ b/mu4web/user/local.py @@ -6,6 +6,7 @@ from . import User passwords: Passwords = password.Passwords(cast(os.PathLike, 'passwords.json')) + class LocalUser(User): def validate(self, password: str) -> bool: return passwords.validate(self._username, password) diff --git a/mu4web/user/pam.py b/mu4web/user/pam.py index ed86afe..55e868e 100644 --- a/mu4web/user/pam.py +++ b/mu4web/user/pam.py @@ -1,6 +1,7 @@ from . import User import pam + class PamUser(User): def validate(self, password: str) -> bool: return pam.authenticate(self._username, password) diff --git a/mu4web/util.py b/mu4web/util.py index c742cd6..c8ccc7d 100644 --- a/mu4web/util.py +++ b/mu4web/util.py @@ -1,5 +1,6 @@ import subprocess + def find(basedir, **flags) -> list[bytes]: cmdline = ['find', basedir] for key, value in flags.items(): |