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

Merge pull request #312 from YunoHost/pyupgrade

Browse source 
Pyupgrade
This commit is contained in:
Alexandre Aubin 2021-12-29 00:45:49 +01:00 committed by GitHub
commit ccc005fb84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 57 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/ldif2dot-0.1.py
View file

@ -34,7 +34,7 @@ ldapsearch -x -b 'dc=nodomain' | \\
import sys
class Element(object):
class Element:
"""Represents an LDIF entry."""
def __init__(self):
@ -109,7 +109,7 @@ class Element(object):
return TABLE_TEMPLATE % (self.index, '\n '.join(_format(self.attributes)), self.edge(dnmap))
class Converter(object):
class Converter:
"""An LDIF to DOT converter."""
def __init__(self):

2
moulinette/__init__.py
View file

@ -31,7 +31,7 @@ __all__ = ["init", "api", "cli", "m18n", "MoulinetteError", "Moulinette"]
m18n = Moulinette18n()
class classproperty(object):
class classproperty:
def __init__(self, f):
self.f = f

28
moulinette/actionsmap.py
View file

@ -30,7 +30,7 @@ logger = logging.getLogger("moulinette.actionsmap")
# Extra parameters definition
class _ExtraParameter(object):
class _ExtraParameter:
"""
Argument parser for an extra parameter.
@ -261,7 +261,7 @@ extraparameters_list = [
# Extra parameters argument Parser
class ExtraArgumentParser(object):
class ExtraArgumentParser:
"""
Argument validator and parser for the extra parameters.
@ -373,7 +373,7 @@ class ExtraArgumentParser(object):
# Main class ----------------------------------------------------------
class ActionsMap(object):
class ActionsMap:
"""Validate and process actions defined into an actions map
@ -410,7 +410,7 @@ class ActionsMap(object):
for n in self.get_namespaces():
logger.debug("loading actions map namespace '%s'", n)
actionsmap_yml = "%s/actionsmap/%s.yml" % (DATA_DIR, n)
actionsmap_yml = "{}/actionsmap/{}.yml".format(DATA_DIR, n)
actionsmap_yml_stat = os.stat(actionsmap_yml)
actionsmap_pkl = "%s/actionsmap/%s-%d-%d.pkl" % (
CACHE_DIR,
@ -428,7 +428,7 @@ class ActionsMap(object):
actionsmap = read_yaml(actionsmap_yml)
# Delete old cache files
for old_cache in glob.glob("%s/actionsmap/%s-*.pkl" % (CACHE_DIR, n)):
for old_cache in glob.glob("{}/actionsmap/{}-*.pkl".format(CACHE_DIR, n)):
os.remove(old_cache)
# at installation, cachedir might not exists
@ -479,7 +479,7 @@ class ActionsMap(object):
auth_method = self.default_authentication
# Load and initialize the authenticator module
auth_module = "%s.authenticators.%s" % (self.main_namespace, auth_method)
auth_module = "{}.authenticators.{}".format(self.main_namespace, auth_method)
logger.debug(f"Loading auth module {auth_module}")
try:
mod = import_module(auth_module)
@ -532,12 +532,12 @@ class ActionsMap(object):
# Retrieve action information
if len(tid) == 4:
namespace, category, subcategory, action = tid
func_name = "%s_%s_%s" % (
func_name = "{}_{}_{}".format(
category,
subcategory.replace("-", "_"),
action.replace("-", "_"),
)
full_action_name = "%s.%s.%s.%s" % (
full_action_name = "{}.{}.{}.{}".format(
namespace,
category,
subcategory,
@ -547,22 +547,22 @@ class ActionsMap(object):
assert len(tid) == 3
namespace, category, action = tid
subcategory = None
func_name = "%s_%s" % (category, action.replace("-", "_"))
full_action_name = "%s.%s.%s" % (namespace, category, action)
func_name = "{}_{}".format(category, action.replace("-", "_"))
full_action_name = "{}.{}.{}".format(namespace, category, action)
# Lock the moulinette for the namespace
with MoulinetteLock(namespace, timeout):
start = time()
try:
mod = __import__(
"%s.%s" % (namespace, category),
"{}.{}".format(namespace, category),
globals=globals(),
level=0,
fromlist=[func_name],
)
logger.debug(
"loading python module %s took %.3fs",
"%s.%s" % (namespace, category),
"{}.{}".format(namespace, category),
time() - start,
)
func = getattr(mod, func_name)
@ -570,7 +570,7 @@ class ActionsMap(object):
import traceback
traceback.print_exc()
error_message = "unable to load function %s.%s because: %s" % (
error_message = "unable to load function {}.{} because: {}".format(
namespace,
func_name,
e,
@ -619,7 +619,7 @@ class ActionsMap(object):
# Look for all files that match the given patterns in the actionsmap dir
for namespace_pattern in NAMESPACE_PATTERNS:
namespaces.extend(
glob.glob("%s/actionsmap/%s.yml" % (DATA_DIR, namespace_pattern))
glob.glob("{}/actionsmap/{}.yml".format(DATA_DIR, namespace_pattern))
)
# Keep only the filenames with extension

2
moulinette/authentication.py
View file

@ -10,7 +10,7 @@ logger = logging.getLogger("moulinette.authenticator")
# Base Class -----------------------------------------------------------
class BaseAuthenticator(object):
class BaseAuthenticator:
"""Authenticator base representation

8
moulinette/core.py
View file

@ -30,7 +30,7 @@ def during_unittests_run():
# Internationalization -------------------------------------------------
class Translator(object):
class Translator:
"""Internationalization class
@ -190,7 +190,7 @@ class Translator(object):
return True
class Moulinette18n(object):
class Moulinette18n:
"""Internationalization service for the moulinette
@ -230,7 +230,7 @@ class Moulinette18n(object):
# Create new Translator object
lib_dir = env["LIB_DIR"]
translator = Translator(
"%s/%s/locales" % (lib_dir, namespace), self.default_locale
"{}/{}/locales".format(lib_dir, namespace), self.default_locale
)
translator.set_locale(self.locale)
self._namespaces[namespace] = translator
@ -312,7 +312,7 @@ class MoulinetteAuthenticationError(MoulinetteError):
http_code = 401
class MoulinetteLock(object):
class MoulinetteLock:
"""Locker for a moulinette instance

8
moulinette/interfaces/__init__.py
View file

@ -22,7 +22,7 @@ CALLBACKS_PROP = "_callbacks"
# Base Class -----------------------------------------------------------
class BaseActionsMapParser(object):
class BaseActionsMapParser:
"""Actions map's base Parser
@ -211,7 +211,7 @@ class _CallbackAction(argparse.Action):
import traceback
traceback.print_exc()
raise ValueError("unable to import method {0}".format(self.callback_method))
raise ValueError("unable to import method {}".format(self.callback_method))
self._callback = func
def __call__(self, parser, namespace, values, option_string=None):
@ -226,7 +226,7 @@ class _CallbackAction(argparse.Action):
except Exception as e:
error_message = (
"cannot get value from callback method "
"'{0}': {1}".format(self.callback_method, e)
"'{}': {}".format(self.callback_method, e)
)
logger.exception(error_message)
raise MoulinetteError(error_message, raw_msg=True)
@ -562,7 +562,7 @@ class PositionalsFirstHelpFormatter(argparse.HelpFormatter):
usage = "\n".join(lines)
# prefix with 'usage:'
return "%s%s\n\n" % (prefix, usage)
return "{}{}\n\n".format(prefix, usage)
class JSONExtendedEncoder(JSONEncoder):

14
moulinette/interfaces/api.py
View file

@ -38,9 +38,9 @@ logger = log.getLogger("moulinette.interface.api")
# We define a global variable to manage in a dirty way the upload...
UPLOAD_DIR = None
CSRF_TYPES = set(
["text/plain", "application/x-www-form-urlencoded", "multipart/form-data"]
)
CSRF_TYPES = {
"text/plain", "application/x-www-form-urlencoded", "multipart/form-data"
}
def is_csrf():
@ -101,7 +101,7 @@ class APIQueueHandler(logging.Handler):
sleep(0)
class _HTTPArgumentParser(object):
class _HTTPArgumentParser:
"""Argument parser for HTTP requests
@ -275,7 +275,7 @@ class Session:
response.delete_cookie(f"session.{Session.actionsmap_name}")
class _ActionsMapPlugin(object):
class _ActionsMapPlugin:
"""Actions map Bottle Plugin
@ -667,7 +667,7 @@ class ActionsMapParser(BaseActionsMapParser):
# Retrieve the tid for the route
_, parser = self._parsers[route]
except KeyError as e:
error_message = "no argument parser found for route '%s': %s" % (route, e)
error_message = "no argument parser found for route '{}': {}".format(route, e)
logger.error(error_message)
raise MoulinetteValidationError(error_message, raw_msg=True)
@ -684,7 +684,7 @@ class ActionsMapParser(BaseActionsMapParser):
# Retrieve the parser for the route
_, parser = self._parsers[route]
except KeyError as e:
error_message = "no argument parser found for route '%s': %s" % (route, e)
error_message = "no argument parser found for route '{}': {}".format(route, e)
logger.error(error_message)
raise MoulinetteValidationError(error_message, raw_msg=True)
ret = argparse.Namespace()

6
moulinette/interfaces/cli.py
View file

@ -251,7 +251,7 @@ class TTYHandler(logging.StreamHandler):
# add translated level name before message
level = "%s " % m18n.g(record.levelname.lower())
color = self.LEVELS_COLOR.get(record.levelno, "white")
msg = "{0}{1}{2}{3}".format(colors_codes[color], level, END_CLI_COLOR, msg)
msg = "{}{}{}{}".format(colors_codes[color], level, END_CLI_COLOR, msg)
if self.formatter:
# use user-defined formatter
record.__dict__[self.message_key] = msg
@ -403,7 +403,7 @@ class ActionsMapParser(BaseActionsMapParser):
except SystemExit:
raise
except Exception as e:
error_message = "unable to parse arguments '%s' because: %s" % (
error_message = "unable to parse arguments '{}' because: {}".format(
" ".join(args),
e,
)
@ -435,7 +435,7 @@ class ActionsMapParser(BaseActionsMapParser):
except SystemExit:
raise
except Exception as e:
error_message = "unable to parse arguments '%s' because: %s" % (
error_message = "unable to parse arguments '{}' because: {}".format(
" ".join(args),
e,
)

14
moulinette/utils/filesystem.py
View file

@ -24,7 +24,7 @@ def read_file(file_path, file_mode="r"):
"""
assert isinstance(
file_path, str
), "Error: file_path '%s' should be a string but is of type '%s' instead" % (
), "Error: file_path '{}' should be a string but is of type '{}' instead".format(
file_path,
type(file_path),
)
@ -121,7 +121,7 @@ def write_to_file(file_path, data, file_mode="w"):
"""
assert (
isinstance(data, str) or isinstance(data, bytes) or isinstance(data, list)
), "Error: data '%s' should be either a string or a list but is of type '%s'" % (
), "Error: data '{}' should be either a string or a list but is of type '{}'".format(
data,
type(data),
)
@ -130,7 +130,7 @@ def write_to_file(file_path, data, file_mode="w"):
)
assert os.path.isdir(
os.path.dirname(file_path)
), "Error: the path ('%s') base dir ('%s') is not a dir" % (
), "Error: the path ('{}') base dir ('{}') is not a dir".format(
file_path,
os.path.dirname(file_path),
)
@ -140,7 +140,7 @@ def write_to_file(file_path, data, file_mode="w"):
for element in data:
assert isinstance(
element, str
), "Error: element '%s' should be a string but is of type '%s' instead" % (
), "Error: element '{}' should be a string but is of type '{}' instead".format(
element,
type(element),
)
@ -179,13 +179,13 @@ def write_to_json(file_path, data, sort_keys=False, indent=None):
# Assumptions
assert isinstance(
file_path, str
), "Error: file_path '%s' should be a string but is of type '%s' instead" % (
), "Error: file_path '{}' should be a string but is of type '{}' instead".format(
file_path,
type(file_path),
)
assert isinstance(data, dict) or isinstance(
data, list
), "Error: data '%s' should be a dict or a list but is of type '%s' instead" % (
), "Error: data '{}' should be a dict or a list but is of type '{}' instead".format(
data,
type(data),
)
@ -194,7 +194,7 @@ def write_to_json(file_path, data, sort_keys=False, indent=None):
)
assert os.path.isdir(
os.path.dirname(file_path)
), "Error: the path ('%s') base dir ('%s') is not a dir" % (
), "Error: the path ('{}') base dir ('{}') is not a dir".format(
file_path,
os.path.dirname(file_path),
)

2
moulinette/utils/log.py
View file

@ -167,7 +167,7 @@ def getActionLogger(name=None, logger=None, action_id=None):
return logger
class ActionFilter(object):
class ActionFilter:
"""Extend log record for an optionnal action

2
moulinette/utils/text.py
View file

@ -59,7 +59,7 @@ def searchf(pattern, path, count=0, flags=re.MULTILINE):
def prependlines(text, prepend):
"""Prepend a string to each line of a text"""
lines = text.splitlines(True)
return "%s%s" % (prepend, prepend.join(lines))
return "{}{}".format(prepend, prepend.join(lines))
# Randomize ------------------------------------------------------------

6
test/conftest.py
View file

@ -40,7 +40,7 @@ def patch_translate(moulinette):
def patch_logging(moulinette):
"""Configure logging to use the custom logger."""
handlers = set(["tty", "api"])
handlers = {"tty", "api"}
root_handlers = set(handlers)
level = "INFO"
@ -97,8 +97,8 @@ def moulinette(tmp_path_factory):
moulinette.env["DATA_DIR"] = tmp_data
moulinette.env["LIB_DIR"] = tmp_lib
shutil.copytree("./test/actionsmap", "%s/actionsmap" % tmp_data)
shutil.copytree("./test/src", "%s/%s" % (tmp_lib, namespace))
shutil.copytree("./test/locales", "%s/%s/locales" % (tmp_lib, namespace))
shutil.copytree("./test/src", "{}/{}".format(tmp_lib, namespace))
shutil.copytree("./test/locales", "{}/{}/locales".format(tmp_lib, namespace))
patch_init(moulinette)
patch_translate(moulinette)

4
test/test_actionsmap.py
View file

@ -192,7 +192,7 @@ def test_extra_argument_parser_add_argument_bad_arg(iface):
with pytest.raises(MoulinetteError) as exception:
extra_argument_parse.add_argument("_global", "foo", {"ask": 1})
expected_msg = "unable to validate extra parameter '%s' for argument '%s': %s" % (
expected_msg = "unable to validate extra parameter '{}' for argument '{}': {}".format(
"ask",
"foo",
"parameter value must be a string, got 1",
@ -266,7 +266,7 @@ def test_actions_map_import_error(mocker):
with pytest.raises(MoulinetteError) as exception:
amap.process({}, timeout=30, route=("GET", "/test-auth/none"))
expected_msg = "unable to load function % s.%s because: %s" % (
expected_msg = "unable to load function {}.{} because: {}".format(
"moulitest",
"testauth_none",
"Yoloswag",

6
test/test_i18n_format_consistency.py
View file

@ -26,10 +26,10 @@ def find_inconsistencies(locale_file):
# Then we check that every "{stuff}" (for python's .format())
# should also be in the translated string, otherwise the .format
# will trigger an exception!
subkeys_in_ref = set(k[0] for k in re.findall(r"{(\w+)(:\w)?}", string))
subkeys_in_this_locale = set(
subkeys_in_ref = {k[0] for k in re.findall(r"{(\w+)(:\w)?}", string)}
subkeys_in_this_locale = {
k[0] for k in re.findall(r"{(\w+)(:\w)?}", this_locale[key])
)
}
if any(k not in subkeys_in_ref for k in subkeys_in_this_locale):
yield """\n

2
test/test_serialize.py
View file

@ -5,7 +5,7 @@ from moulinette.interfaces import JSONExtendedEncoder
def test_json_extended_encoder(caplog):
encoder = JSONExtendedEncoder()
assert encoder.default(set([1, 2, 3])) == [1, 2, 3]
assert encoder.default({1, 2, 3}) == [1, 2, 3]
assert encoder.default(dt(1917, 3, 8)) == "1917-03-08T00:00:00+00:00"

6
test/test_translation_format_consistency.py
View file

@ -26,10 +26,10 @@ def find_inconsistencies(locale_file):
# Then we check that every "{stuff}" (for python's .format())
# should also be in the translated string, otherwise the .format
# will trigger an exception!
subkeys_in_ref = set(k[0] for k in re.findall(r"{(\w+)(:\w)?}", string))
subkeys_in_this_locale = set(
subkeys_in_ref = {k[0] for k in re.findall(r"{(\w+)(:\w)?}", string)}
subkeys_in_this_locale = {
k[0] for k in re.findall(r"{(\w+)(:\w)?}", this_locale[key])
)
}
if any(k not in subkeys_in_ref for k in subkeys_in_this_locale):
yield """\n