YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Unused imports

Browse source
This commit is contained in:
Alexandre Aubin 2018-11-04 16:47:20 +01:00
parent 787bfaa058
commit 361f4e7a60
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/yunohost/tools.py
View file

@ -32,7 +32,6 @@ import logging
import subprocess import subprocess
import pwd import pwd
import socket import socket
import cracklib
from xmlrpclib import Fault from xmlrpclib import Fault
from importlib import import_module from importlib import import_module
from collections import OrderedDict from collections import OrderedDict
@ -130,9 +129,9 @@ def tools_adminpw(auth, new_password):
from yunohost.user import _hash_user_password from yunohost.user import _hash_user_password
from yunohost.utils.password import assert_password_is_strong_enough from yunohost.utils.password import assert_password_is_strong_enough
import spwd import spwd
assert_password_is_strong_enough("admin", new_password) assert_password_is_strong_enough("admin", new_password)
new_hash = _hash_user_password(new_password) new_hash = _hash_user_password(new_password)
try: try:

9
src/yunohost/user.py
View file

@ -32,7 +32,6 @@ import crypt
import random import random
import string import string
import subprocess import subprocess
import cracklib
from moulinette import m18n from moulinette import m18n
from moulinette.core import MoulinetteError from moulinette.core import MoulinetteError
@ -132,7 +131,7 @@ def user_create(operation_logger, auth, username, firstname, lastname, mail, pas
all_existing_usernames = {x.pw_name for x in pwd.getpwall()} all_existing_usernames = {x.pw_name for x in pwd.getpwall()}
if username in all_existing_usernames: if username in all_existing_usernames:
raise MoulinetteError(errno.EEXIST, m18n.n('system_username_exists')) raise MoulinetteError(errno.EEXIST, m18n.n('system_username_exists'))
main_domain = _get_maindomain() main_domain = _get_maindomain()
aliases = [ aliases = [
'root@' + main_domain, 'root@' + main_domain,
@ -140,9 +139,9 @@ def user_create(operation_logger, auth, username, firstname, lastname, mail, pas
'webmaster@' + main_domain, 'webmaster@' + main_domain,
'postmaster@' + main_domain, 'postmaster@' + main_domain,
] ]
if mail in aliases: if mail in aliases:
raise MoulinetteError(errno.EEXIST,m18n.n('mail_unavailable')) raise MoulinetteError(errno.EEXIST,m18n.n('mail_unavailable'))
# Check that the mail domain exists # Check that the mail domain exists
if mail.split("@")[1] not in domain_list(auth)['domains']: if mail.split("@")[1] not in domain_list(auth)['domains']:
@ -333,7 +332,7 @@ def user_update(operation_logger, auth, username, firstname=None, lastname=None,
domain=mail[mail.find('@') + 1:])) domain=mail[mail.find('@') + 1:]))
if mail in aliases: if mail in aliases:
raise MoulinetteError(errno.EEXIST,m18n.n('mail_unavailable')) raise MoulinetteError(errno.EEXIST,m18n.n('mail_unavailable'))
del user['mail'][0] del user['mail'][0]
new_attr_dict['mail'] = [mail] + user['mail'] new_attr_dict['mail'] = [mail] + user['mail']