From c274ad6d546c2549afafb95f33c6026971460759 Mon Sep 17 00:00:00 2001 From: George Drummond Date: Wed, 2 Jan 2019 11:39:08 -0500 Subject: [PATCH] Remove LRU cache --- atst/utils/localization.py | 17 +++-------------- tests/utils/test_localization.py | 11 +---------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/atst/utils/localization.py b/atst/utils/localization.py index 500ed62c..884e0259 100644 --- a/atst/utils/localization.py +++ b/atst/utils/localization.py @@ -1,11 +1,8 @@ import yaml import os from flask import current_app as app -from functools import lru_cache from atst.utils import getattr_path -ENV = os.getenv("FLASK_ENV", "dev") - class LocalizationInvalidKeyError(Exception): def __init__(self, key, variables): @@ -18,26 +15,18 @@ class LocalizationInvalidKeyError(Exception): ) -localizations_cache_size = 1 if ENV == "dev" else None - - -@lru_cache(maxsize=localizations_cache_size) -def load_cached_translations_file(file_name): - return open(file_name).read() - - def _translations_file(): file_name = "translations.yaml" if app: - file_name = app.config.get("TRANSLATIONS_FILE") or file_name + file_name = app.config.get("DEFAULT_TRANSLATIONS_FILE", file_name) - return file_name + return open(file_name) def translate(key, variables=None): translations_file = _translations_file() - translations = yaml.safe_load(load_cached_translations_file(translations_file)) + translations = yaml.safe_load(translations_file) value = getattr_path(translations, key) if variables is None: diff --git a/tests/utils/test_localization.py b/tests/utils/test_localization.py index c5ee5b22..137d602a 100644 --- a/tests/utils/test_localization.py +++ b/tests/utils/test_localization.py @@ -1,14 +1,5 @@ import pytest -from atst.utils.localization import ( - translate, - load_cached_translations_file, - LocalizationInvalidKeyError, -) - - -def test_loading_cached_translations_file_returns_the_file_contents(): - file_name = "translations.yaml" - assert load_cached_translations_file(file_name) == open(file_name).read() +from atst.utils.localization import translate, LocalizationInvalidKeyError def test_looking_up_existing_key():