From 2dd1d8ccfe59bbbf32813172ead3d04b283c490c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 12 Dec 2018 02:49:36 +0000 Subject: [PATCH] Unused errno + remaining unecessary m18n.n --- src/yunohost/app.py | 8 +++----- src/yunohost/backup.py | 1 - src/yunohost/certificate.py | 1 - .../data_migrations/0002_migrate_to_tsig_sha256.py | 1 - src/yunohost/domain.py | 1 - src/yunohost/dyndns.py | 1 - src/yunohost/firewall.py | 1 - src/yunohost/hook.py | 1 - src/yunohost/log.py | 1 - src/yunohost/monitor.py | 1 - src/yunohost/service.py | 1 - src/yunohost/settings.py | 1 - src/yunohost/ssh.py | 1 - src/yunohost/tools.py | 1 - src/yunohost/user.py | 1 - src/yunohost/utils/password.py | 2 -- src/yunohost/utils/yunopaste.py | 1 - 17 files changed, 3 insertions(+), 22 deletions(-) diff --git a/src/yunohost/app.py b/src/yunohost/app.py index f4e48de45..510b60e95 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -30,7 +30,6 @@ import yaml import time import re import urlparse -import errno import subprocess import glob import pwd @@ -2076,10 +2075,9 @@ def _check_manifest_requirements(manifest, app_instance_name): for pkgname, spec in requirements.items(): version = versions[pkgname] if version not in packages.SpecifierSet(spec): - raise YunohostError( - errno.EINVAL, m18n.n('app_requirements_unmeet', - pkgname=pkgname, version=version, - spec=spec, app=app_instance_name)) + raise YunohostError('app_requirements_unmeet', + pkgname=pkgname, version=version, + spec=spec, app=app_instance_name) def _parse_args_from_manifest(manifest, action, args={}, auth=None): diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py index a44819a33..6ed73d343 100644 --- a/src/yunohost/backup.py +++ b/src/yunohost/backup.py @@ -26,7 +26,6 @@ import os import re import json -import errno import time import tarfile import shutil diff --git a/src/yunohost/certificate.py b/src/yunohost/certificate.py index ca27d59df..cdcf4bbe9 100644 --- a/src/yunohost/certificate.py +++ b/src/yunohost/certificate.py @@ -24,7 +24,6 @@ import os import sys -import errno import shutil import pwd import grp diff --git a/src/yunohost/data_migrations/0002_migrate_to_tsig_sha256.py b/src/yunohost/data_migrations/0002_migrate_to_tsig_sha256.py index e81b20e5f..39e4d2afe 100644 --- a/src/yunohost/data_migrations/0002_migrate_to_tsig_sha256.py +++ b/src/yunohost/data_migrations/0002_migrate_to_tsig_sha256.py @@ -4,7 +4,6 @@ import requests import base64 import time import json -import errno from moulinette import m18n from yunohost.utils.error import YunohostError diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py index e28a24afe..83da7e18c 100644 --- a/src/yunohost/domain.py +++ b/src/yunohost/domain.py @@ -27,7 +27,6 @@ import os import re import json import yaml -import errno from moulinette import m18n, msettings from yunohost.utils.error import YunohostError diff --git a/src/yunohost/dyndns.py b/src/yunohost/dyndns.py index 13dd4b43d..e83280b19 100644 --- a/src/yunohost/dyndns.py +++ b/src/yunohost/dyndns.py @@ -29,7 +29,6 @@ import json import glob import time import base64 -import errno import subprocess from moulinette import m18n diff --git a/src/yunohost/firewall.py b/src/yunohost/firewall.py index fb1804659..f7c6c0875 100644 --- a/src/yunohost/firewall.py +++ b/src/yunohost/firewall.py @@ -26,7 +26,6 @@ import os import sys import yaml -import errno try: import miniupnpc except ImportError: diff --git a/src/yunohost/hook.py b/src/yunohost/hook.py index 901321926..5a6c4c154 100644 --- a/src/yunohost/hook.py +++ b/src/yunohost/hook.py @@ -25,7 +25,6 @@ """ import os import re -import errno import tempfile from glob import iglob diff --git a/src/yunohost/log.py b/src/yunohost/log.py index 3c7ff02f3..7b32f18dd 100644 --- a/src/yunohost/log.py +++ b/src/yunohost/log.py @@ -26,7 +26,6 @@ import os import yaml -import errno import collections from datetime import datetime diff --git a/src/yunohost/monitor.py b/src/yunohost/monitor.py index 4fef2ca61..469ac41f1 100644 --- a/src/yunohost/monitor.py +++ b/src/yunohost/monitor.py @@ -31,7 +31,6 @@ import calendar import subprocess import xmlrpclib import os.path -import errno import os import dns.resolver import cPickle as pickle diff --git a/src/yunohost/service.py b/src/yunohost/service.py index 082b32eab..b2c18c74e 100644 --- a/src/yunohost/service.py +++ b/src/yunohost/service.py @@ -28,7 +28,6 @@ import time import yaml import json import subprocess -import errno import shutil import hashlib diff --git a/src/yunohost/settings.py b/src/yunohost/settings.py index 8783188a1..12b046146 100644 --- a/src/yunohost/settings.py +++ b/src/yunohost/settings.py @@ -1,6 +1,5 @@ import os import json -import errno from datetime import datetime from collections import OrderedDict diff --git a/src/yunohost/ssh.py b/src/yunohost/ssh.py index e284736c4..a9e5babf7 100644 --- a/src/yunohost/ssh.py +++ b/src/yunohost/ssh.py @@ -2,7 +2,6 @@ import re import os -import errno import pwd import subprocess diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py index 51c19ff34..6102b9f7a 100644 --- a/src/yunohost/tools.py +++ b/src/yunohost/tools.py @@ -27,7 +27,6 @@ import re import os import yaml import json -import errno import logging import subprocess import pwd diff --git a/src/yunohost/user.py b/src/yunohost/user.py index 1cec8922d..ea8dc30a9 100644 --- a/src/yunohost/user.py +++ b/src/yunohost/user.py @@ -27,7 +27,6 @@ import os import re import pwd import json -import errno import crypt import random import string diff --git a/src/yunohost/utils/password.py b/src/yunohost/utils/password.py index ddc59cbe9..9cee56d53 100644 --- a/src/yunohost/utils/password.py +++ b/src/yunohost/utils/password.py @@ -81,9 +81,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 errno import logging - from moulinette import m18n from yunohost.utils.error import YunohostError from moulinette.utils.log import getActionLogger diff --git a/src/yunohost/utils/yunopaste.py b/src/yunohost/utils/yunopaste.py index 7a3847873..e349ebc32 100644 --- a/src/yunohost/utils/yunopaste.py +++ b/src/yunohost/utils/yunopaste.py @@ -2,7 +2,6 @@ import requests import json -import errno from yunohost.utils.error import YunohostError