From ffd34c35044fb3e06dff89ddb7d3153b54406ec9 Mon Sep 17 00:00:00 2001
From: nd <git@notandy.de>
Date: Sat, 19 Sep 2020 00:32:33 +0200
Subject: [PATCH] fixed pylint errors
---
.pylintrc | 2 +-
uffd/mail/models.py | 11 ++++-------
uffd/mail/views.py | 5 ++---
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/.pylintrc b/.pylintrc
index 275ec9f1..d9240481 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -203,7 +203,7 @@ ignore-docstrings=yes
ignore-imports=no
# Minimum lines number of a similarity.
-min-similarity-lines=4
+min-similarity-lines=6
[TYPECHECK]
diff --git a/uffd/mail/models.py b/uffd/mail/models.py
index dd8d810b..3110f33d 100644
--- a/uffd/mail/models.py
+++ b/uffd/mail/models.py
@@ -1,15 +1,13 @@
-import secrets
-
-from ldap3 import MODIFY_REPLACE, MODIFY_DELETE, MODIFY_ADD, HASHED_SALTED_SHA512
+from ldap3 import MODIFY_REPLACE
from flask import current_app
from uffd import ldap
class Mail():
- def __init__(self, uid=None, destinations=[], receivers=[], dn=None):
+ def __init__(self, uid=None, destinations=None, receivers=None, dn=None):
self.uid = uid
- self.receivers = receivers
- self.destinations = destinations
+ self.receivers = receivers if receivers else []
+ self.destinations = destinations if destinations else []
self.dn = dn
@classmethod
@@ -47,4 +45,3 @@ class Mail():
}
result = conn.modify(self.dn, attributes)
return result
-
diff --git a/uffd/mail/views.py b/uffd/mail/views.py
index 8ad6410d..eeafb095 100644
--- a/uffd/mail/views.py
+++ b/uffd/mail/views.py
@@ -26,7 +26,6 @@ def index():
mails = []
for i in conn.entries:
mails.append(Mail.from_ldap(i))
- print(mails)
return render_template('mail_list.html', mails=mails)
@bp.route("/<uid>")
@@ -57,8 +56,8 @@ def update(uid=False):
if is_newmail:
mail.uid = request.form.get('mail-uid')
- mail.receivers = request.form.get('mail-receivers', '').splitlines();
- mail.destinations = request.form.get('mail-destinations', '').splitlines();
+ mail.receivers = request.form.get('mail-receivers', '').splitlines()
+ mail.destinations = request.form.get('mail-destinations', '').splitlines()
if mail.to_ldap(new=is_newmail):
flash('Mail mapping updated.')
--
GitLab