diff --git a/docs/changes.rst b/docs/changes.rst index c8487490..9e0d21d7 100644 --- a/docs/changes.rst +++ b/docs/changes.rst @@ -7,6 +7,7 @@ Unreleased Unreleased - ``validate_on_submit`` takes a ``extra_validators`` parameters :pr:`479` +- Stop supporting Flask-Babelex :pr:`540` Version 1.1.0 diff --git a/src/flask_wtf/i18n.py b/src/flask_wtf/i18n.py index 79432a1e..1cc0e9c5 100644 --- a/src/flask_wtf/i18n.py +++ b/src/flask_wtf/i18n.py @@ -1,13 +1,9 @@ from babel import support from flask import current_app from flask import request +from flask_babel import get_locale from wtforms.i18n import messages_path -try: - from flask_babel import get_locale -except ImportError: - from flask_babelex import get_locale - __all__ = ("Translations", "translations") diff --git a/tests/test_i18n.py b/tests/test_i18n.py index ef432d60..5a2c3d98 100644 --- a/tests/test_i18n.py +++ b/tests/test_i18n.py @@ -6,9 +6,7 @@ from flask_wtf import FlaskForm -pytest.importorskip( - "flask_wtf.i18n", reason="Neither Flask-Babel nor Flask-BabelEx is installed." -) +pytest.importorskip("flask_wtf.i18n", reason="Flask-Babel is not installed.") class NameForm(FlaskForm): @@ -32,10 +30,7 @@ def test_i18n(app, client): try: from flask_babel import Babel except ImportError: - try: - from flask_babelex import Babel - except ImportError: - pytest.skip("Flask-Babel or Flask-BabelEx must be installed.") + pytest.skip("Flask-Babel must be installed.") babel = Babel(app) diff --git a/tox.ini b/tox.ini index 7293c108..2e6de252 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] envlist = py3{11,10,9,8,7},pypy3{8,7} - py-{babelex,no-babel} + py-{no-babel} style docs @@ -12,12 +12,6 @@ deps = Flask-Uploads commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs} -[testenv:py-babelex] -deps = - -r requirements/tests.txt - Flask-BabelEx -commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs} - [testenv:py-no-babel] deps = -r requirements/tests.txt commands = pytest -v --tb=short --basetemp={envtmpdir} {posargs}