Fix f-strings and linter

This commit is contained in:
Alexandre Aubin 2021-06-13 19:09:24 +02:00
parent a012369164
commit f985507761
3 changed files with 4 additions and 20 deletions

View file

@ -79,7 +79,7 @@ class BaseAuthenticator(object):
except MoulinetteError: except MoulinetteError:
raise raise
except Exception as e: except Exception as e:
logger.exception("authentication {self.name} failed because '{e}'") logger.exception(f"authentication {self.name} failed because '{e}'")
raise MoulinetteAuthenticationError("unable_authenticate") raise MoulinetteAuthenticationError("unable_authenticate")
else: else:
is_authenticated = True is_authenticated = True
@ -93,7 +93,7 @@ class BaseAuthenticator(object):
import traceback import traceback
traceback.print_exc() traceback.print_exc()
logger.exception("unable to store session because %s", e) logger.exception(f"unable to store session because {e}")
else: else:
logger.debug("session has been stored") logger.debug("session has been stored")
@ -108,7 +108,7 @@ class BaseAuthenticator(object):
except MoulinetteError: except MoulinetteError:
raise raise
except Exception as e: except Exception as e:
logger.exception("authentication {self.name} failed because '{e}'") logger.exception(f"authentication {self.name} failed because '{e}'")
raise MoulinetteAuthenticationError("unable_authenticate") raise MoulinetteAuthenticationError("unable_authenticate")
else: else:
is_authenticated = True is_authenticated = True

View file

@ -8,6 +8,7 @@ logger = logging.getLogger("moulinette.authenticator.yoloswag")
# Dummy authenticator implementation # Dummy authenticator implementation
class Authenticator(BaseAuthenticator): class Authenticator(BaseAuthenticator):
"""Dummy authenticator used for tests""" """Dummy authenticator used for tests"""

View file

@ -156,27 +156,10 @@ def test_required_paremeter_missing_value(iface, caplog):
def test_actions_map_unknown_authenticator(monkeypatch, tmp_path): def test_actions_map_unknown_authenticator(monkeypatch, tmp_path):
# from moulinette.interfaces.cli import ActionsMapParser
# import argparse
#
# parser = argparse.ArgumentParser(add_help=False)
# parser.add_argument(
# "--debug",
# action="store_true",
# default=False,
# help="Log and print debug messages",
# )
#
#monkeypatch.setenv("MOULINETTE_DATA_DIR", str(tmp_path))
#actionsmap_dir = tmp_path / "actionsmap"
#actionsmap_dir.mkdir()
from moulinette.interfaces.api import ActionsMapParser from moulinette.interfaces.api import ActionsMapParser
amap = ActionsMap(ActionsMapParser()) amap = ActionsMap(ActionsMapParser())
#from moulinette.interfaces import BaseActionsMapParser
#amap = ActionsMap(BaseActionsMapParser())
with pytest.raises(MoulinetteError) as exception: with pytest.raises(MoulinetteError) as exception:
amap.get_authenticator("unknown") amap.get_authenticator("unknown")
assert "No module named" in str(exception) assert "No module named" in str(exception)