diff --git a/data/hooks/diagnosis/14-ports.py b/data/hooks/diagnosis/14-ports.py index 38f6e0089..eec2e5f03 100644 --- a/data/hooks/diagnosis/14-ports.py +++ b/data/hooks/diagnosis/14-ports.py @@ -3,7 +3,6 @@ import os from yunohost.diagnosis import Diagnoser -from yunohost.utils.error import YunohostError from yunohost.service import _get_services class PortsDiagnoser(Diagnoser): diff --git a/data/hooks/diagnosis/21-web.py b/data/hooks/diagnosis/21-web.py index c1f6d912a..94665a6e6 100644 --- a/data/hooks/diagnosis/21-web.py +++ b/data/hooks/diagnosis/21-web.py @@ -8,7 +8,6 @@ from moulinette.utils.filesystem import read_file from yunohost.diagnosis import Diagnoser from yunohost.domain import domain_list -from yunohost.utils.error import YunohostError DIAGNOSIS_SERVER = "diagnosis.yunohost.org" diff --git a/data/hooks/diagnosis/70-regenconf.py b/data/hooks/diagnosis/70-regenconf.py index 0dff71b5b..396f64a0f 100644 --- a/data/hooks/diagnosis/70-regenconf.py +++ b/data/hooks/diagnosis/70-regenconf.py @@ -2,7 +2,6 @@ import os -import subprocess from yunohost.diagnosis import Diagnoser from yunohost.regenconf import _get_regenconf_infos, _calculate_hash diff --git a/src/yunohost/app.py b/src/yunohost/app.py index f9f31c64a..0caa9d5e1 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -681,7 +681,7 @@ def app_install(operation_logger, app, label=None, args=None, no_remove_on_failu from yunohost.hook import hook_add, hook_remove, hook_exec, hook_callback from yunohost.log import OperationLogger - from yunohost.permission import user_permission_list, permission_create, permission_url, permission_delete, permission_sync_to_user, user_permission_update + from yunohost.permission import user_permission_list, permission_create, permission_url, permission_delete, permission_sync_to_user from yunohost.regenconf import manually_modified_files # Fetch or extract sources diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py index bfe958a89..14d96f45c 100644 --- a/src/yunohost/backup.py +++ b/src/yunohost/backup.py @@ -894,8 +894,6 @@ class RestoreManager(): """ from permission import permission_sync_to_user - successfull_apps = self.targets.list("apps", include=["Success", "Warning"]) - permission_sync_to_user() if os.path.ismount(self.work_dir): @@ -1160,7 +1158,7 @@ class RestoreManager(): return from yunohost.user import user_group_list - from yunohost.permission import permission_create, permission_delete, user_permission_update, user_permission_list, permission_sync_to_user + from yunohost.permission import permission_create, permission_delete, user_permission_list, permission_sync_to_user # Backup old permission for apps # We need to do that because in case of an app is installed we can't remove the permission for this app @@ -1257,7 +1255,7 @@ class RestoreManager(): name should be already install) """ from yunohost.user import user_group_list - from yunohost.permission import permission_create, permission_delete, user_permission_list, user_permission_update, permission_sync_to_user + from yunohost.permission import permission_create, permission_delete, user_permission_list, permission_sync_to_user def copytree(src, dst, symlinks=False, ignore=None): for item in os.listdir(src): diff --git a/src/yunohost/data_migrations/0016_php70_to_php73_pools.py b/src/yunohost/data_migrations/0016_php70_to_php73_pools.py index 1cdb2bc4d..73875d359 100644 --- a/src/yunohost/data_migrations/0016_php70_to_php73_pools.py +++ b/src/yunohost/data_migrations/0016_php70_to_php73_pools.py @@ -4,7 +4,7 @@ from shutil import copy2 from moulinette.utils.log import getActionLogger -from yunohost.app import _is_installed, _get_app_settings, _set_app_settings, _patch_legacy_php_versions_in_settings +from yunohost.app import _is_installed, _patch_legacy_php_versions_in_settings from yunohost.tools import Migration from yunohost.service import _run_service_command diff --git a/src/yunohost/data_migrations/0017_postgresql_9p6_to_11.py b/src/yunohost/data_migrations/0017_postgresql_9p6_to_11.py index 955393c5b..3cb904613 100644 --- a/src/yunohost/data_migrations/0017_postgresql_9p6_to_11.py +++ b/src/yunohost/data_migrations/0017_postgresql_9p6_to_11.py @@ -28,7 +28,7 @@ class MyMigration(Migration): # Make sure there's a 9.6 cluster try: self.runcmd("pg_lsclusters | grep -q '^9.6 '") - except Exception as e: + except Exception: logger.warning("It looks like there's not active 9.6 cluster, so probably don't need to run this migration") return diff --git a/src/yunohost/firewall.py b/src/yunohost/firewall.py index 4c3cfb0f7..c17e958e7 100644 --- a/src/yunohost/firewall.py +++ b/src/yunohost/firewall.py @@ -24,7 +24,6 @@ Manage firewall rules """ import os -import sys import yaml import miniupnpc diff --git a/src/yunohost/permission.py b/src/yunohost/permission.py index 67a0f57b0..cd81489a2 100644 --- a/src/yunohost/permission.py +++ b/src/yunohost/permission.py @@ -31,7 +31,6 @@ import random from moulinette import m18n from moulinette.utils.log import getActionLogger from yunohost.utils.error import YunohostError -from yunohost.user import user_list from yunohost.log import is_unit_operation logger = getActionLogger('yunohost.user') diff --git a/src/yunohost/regenconf.py b/src/yunohost/regenconf.py index 6c9b10aac..7f4f73247 100644 --- a/src/yunohost/regenconf.py +++ b/src/yunohost/regenconf.py @@ -21,7 +21,6 @@ import os import yaml -import json import subprocess import shutil import hashlib @@ -31,7 +30,6 @@ from datetime import datetime from moulinette import m18n from moulinette.utils import log, filesystem -from moulinette.utils.filesystem import read_file from yunohost.utils.error import YunohostError from yunohost.log import is_unit_operation diff --git a/src/yunohost/tests/test_appscatalog.py b/src/yunohost/tests/test_appscatalog.py index 40cf1489f..d9f0c14e5 100644 --- a/src/yunohost/tests/test_appscatalog.py +++ b/src/yunohost/tests/test_appscatalog.py @@ -6,7 +6,7 @@ import glob import shutil from moulinette import m18n -from moulinette.utils.filesystem import read_json, write_to_json, write_to_yaml, mkdir +from moulinette.utils.filesystem import read_json, write_to_json, write_to_yaml from yunohost.utils.error import YunohostError from yunohost.app import (_initialize_apps_catalog_system, diff --git a/src/yunohost/tests/test_permission.py b/src/yunohost/tests/test_permission.py index 82ec151f3..4dfc1ce6b 100644 --- a/src/yunohost/tests/test_permission.py +++ b/src/yunohost/tests/test_permission.py @@ -4,7 +4,7 @@ import os from conftest import message, raiseYunohostError, get_test_apps_dir -from yunohost.app import app_install, app_remove, app_change_url, app_list, app_map, _installed_apps +from yunohost.app import app_install, app_remove, app_change_url, app_map, _installed_apps from yunohost.user import user_list, user_create, user_delete, \ user_group_list, user_group_delete from yunohost.permission import user_permission_update, user_permission_list, user_permission_reset, \ @@ -370,16 +370,6 @@ def test_permission_reset_idempotency(): assert set(res['blog.main']['corresponding_users']) == set(["alice", "bob"]) -def test_permission_reset_idempotency(): - # Reset permission - user_permission_reset("blog.main") - user_permission_reset("blog.main") - - res = user_permission_list(full=True)['permissions'] - assert res['blog.main']['allowed'] == ["all_users"] - assert set(res['blog.main']['corresponding_users']) == set(["alice", "bob"]) - - # # Error on update function # diff --git a/src/yunohost/tests/test_settings.py b/src/yunohost/tests/test_settings.py index 3fdfce67c..c7105fd1b 100644 --- a/src/yunohost/tests/test_settings.py +++ b/src/yunohost/tests/test_settings.py @@ -64,10 +64,10 @@ def test_settings_list(): def test_settings_set(): settings_set("example.bool", False) - assert settings_get("example.bool") == False + assert settings_get("example.bool") is False settings_set("example.bool", "on") - assert settings_get("example.bool") == True + assert settings_get("example.bool") is True def test_settings_set_int(): settings_set("example.int", 21) diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py index b6d45b03c..2e90b38ee 100644 --- a/src/yunohost/tools.py +++ b/src/yunohost/tools.py @@ -26,10 +26,8 @@ import re import os import yaml -import json import subprocess import pwd -import socket from importlib import import_module from moulinette import msignals, m18n @@ -37,8 +35,8 @@ from moulinette.utils.log import getActionLogger from moulinette.utils.process import check_output, call_async_output from moulinette.utils.filesystem import read_json, write_to_json, read_yaml, write_to_yaml -from yunohost.app import _update_apps_catalog, app_info, app_upgrade, app_ssowatconf, app_list, _initialize_apps_catalog_system -from yunohost.domain import domain_add, domain_list +from yunohost.app import _update_apps_catalog, app_info, app_upgrade, _initialize_apps_catalog_system +from yunohost.domain import domain_add from yunohost.dyndns import _dyndns_available, _dyndns_provides from yunohost.firewall import firewall_upnp from yunohost.service import service_start, service_enable @@ -118,7 +116,7 @@ def tools_ldapinit(): if not os.path.isdir('/home/{0}'.format("admin")): logger.warning(m18n.n('user_home_creation_failed'), exc_info=1) - + logger.success(m18n.n('ldap_initialized')) diff --git a/src/yunohost/user.py b/src/yunohost/user.py index d19da177c..35b316859 100644 --- a/src/yunohost/user.py +++ b/src/yunohost/user.py @@ -27,7 +27,6 @@ import os import re import pwd import grp -import json import crypt import random import string @@ -36,7 +35,6 @@ import copy from moulinette import m18n from moulinette.utils.log import getActionLogger -from moulinette.utils.filesystem import read_json, write_to_json, read_yaml, write_to_yaml from yunohost.utils.error import YunohostError from yunohost.service import service_status @@ -239,7 +237,6 @@ def user_delete(operation_logger, username, purge=False): """ from yunohost.hook import hook_callback from yunohost.utils.ldap import _get_ldap_interface - from yunohost.permission import permission_sync_to_user if username not in user_list()["users"]: raise YunohostError('user_unknown', user=username) diff --git a/src/yunohost/utils/password.py b/src/yunohost/utils/password.py index b4f7025f7..e7ff6c275 100644 --- a/src/yunohost/utils/password.py +++ b/src/yunohost/utils/password.py @@ -63,7 +63,7 @@ class PasswordValidator(object): settings = json.load(open('/etc/yunohost/settings.json', "r")) setting_key = "security.password." + profile + ".strength" self.validation_strength = int(settings[setting_key]["value"]) - except Exception as e: + except Exception: # Fallback to default value if we can't fetch settings for some reason self.validation_strength = 1 @@ -83,11 +83,7 @@ class PasswordValidator(object): # on top (at least not the moulinette ones) # because the moulinette needs to be correctly initialized # as well as modules available in python's path. - import logging from yunohost.utils.error import YunohostError - from moulinette.utils.log import getActionLogger - - logger = logging.getLogger('yunohost.utils.password') status, msg = self.validation_summary(password) if status == "error": diff --git a/tests/remove_stale_translated_strings.py b/tests/remove_stale_translated_strings.py index 0213bc2be..4e39f131e 100644 --- a/tests/remove_stale_translated_strings.py +++ b/tests/remove_stale_translated_strings.py @@ -1,4 +1,3 @@ -import re import json import glob from collections import OrderedDict