Merge pull request #184 from lautat/fix/app-context-force-locale

Fix force locale in app context and multiple threads

Author: TkTech

flask_babel/__init__.py

@@ -9,11 +9,11 @@
 """
 from __future__ import absolute_import
 import os
+from types import SimpleNamespace
 
 from datetime import datetime
 from contextlib import contextmanager
-from flask import current_app, request
-from flask.ctx import has_request_context
+from flask import current_app, g
 from flask.helpers import locked_cached_property
 from babel import dates, numbers, support, Locale
 from pytz import timezone, UTC
@@ -661,11 +661,13 @@ def lazy_pgettext(self, context, string, **variables):
 
 
 def _get_current_context():
-    if has_request_context():
-        return request
+    if not g:
+        return None
+
+    if not hasattr(g, "_flask_babel"):
+        g._flask_babel = SimpleNamespace()
 
-    if current_app:
-        return current_app
+    return g._flask_babel
 
 
 def get_domain():

tests/test_date_formatting.py

@@ -2,7 +2,6 @@
 from __future__ import with_statement
 
 from datetime import datetime, timedelta
-from threading import Semaphore, Thread
 
 import flask
 
@@ -107,60 +106,3 @@ def test_refreshing():
         app.config['BABEL_DEFAULT_TIMEZONE'] = 'Europe/Vienna'
         babel.refresh()
         assert babel.format_datetime(d) == 'Apr 12, 2010, 3:46:00 PM'
-
-
-def test_force_locale():
-    app = flask.Flask(__name__)
-    b = babel.Babel(app)
-
-    @b.localeselector
-    def select_locale():
-        return 'de_DE'
-
-    with app.test_request_context():
-        assert str(babel.get_locale()) == 'de_DE'
-        with babel.force_locale('en_US'):
-            assert str(babel.get_locale()) == 'en_US'
-        assert str(babel.get_locale()) == 'de_DE'
-
-
-def test_force_locale_with_threading():
-    app = flask.Flask(__name__)
-    b = babel.Babel(app)
-
-    @b.localeselector
-    def select_locale():
-        return 'de_DE'
-
-    semaphore = Semaphore(value=0)
-
-    def first_request():
-        with app.test_request_context():
-            with babel.force_locale('en_US'):
-                assert str(babel.get_locale()) == 'en_US'
-                semaphore.acquire()
-
-    thread = Thread(target=first_request)
-    thread.start()
-
-    try:
-        with app.test_request_context():
-            assert str(babel.get_locale()) == 'de_DE'
-    finally:
-        semaphore.release()
-        thread.join()
-
-
-def test_refresh_during_force_locale():
-    app = flask.Flask(__name__)
-    b = babel.Babel(app)
-
-    @b.localeselector
-    def select_locale():
-        return 'de_DE'
-
-    with app.test_request_context():
-        with babel.force_locale('en_US'):
-            assert str(babel.get_locale()) == 'en_US'
-            babel.refresh()
-            assert str(babel.get_locale()) == 'en_US'

tests/test_force_locale.py

@@ -0,0 +1,89 @@
+from threading import Semaphore, Thread
+
+import flask
+
+import flask_babel as babel
+
+
+def test_force_locale():
+    app = flask.Flask(__name__)
+    b = babel.Babel(app)
+
+    @b.localeselector
+    def select_locale():
+        return 'de_DE'
+
+    with app.test_request_context():
+        assert str(babel.get_locale()) == 'de_DE'
+        with babel.force_locale('en_US'):
+            assert str(babel.get_locale()) == 'en_US'
+        assert str(babel.get_locale()) == 'de_DE'
+
+
+def test_force_locale_with_threading():
+    app = flask.Flask(__name__)
+    b = babel.Babel(app)
+
+    @b.localeselector
+    def select_locale():
+        return 'de_DE'
+
+    semaphore = Semaphore(value=0)
+
+    def first_request():
+        with app.test_request_context():
+            with babel.force_locale('en_US'):
+                assert str(babel.get_locale()) == 'en_US'
+                semaphore.acquire()
+
+    thread = Thread(target=first_request)
+    thread.start()
+
+    try:
+        with app.test_request_context():
+            assert str(babel.get_locale()) == 'de_DE'
+    finally:
+        semaphore.release()
+        thread.join()
+
+
+def test_force_locale_with_threading_and_app_context():
+    app = flask.Flask(__name__)
+    b = babel.Babel(app)
+
+    @b.localeselector
+    def select_locale():
+        return 'de_DE'
+
+    semaphore = Semaphore(value=0)
+
+    def first_app_context():
+        with app.app_context():
+            with babel.force_locale('en_US'):
+                assert str(babel.get_locale()) == 'en_US'
+                semaphore.acquire()
+
+    thread = Thread(target=first_app_context)
+    thread.start()
+
+    try:
+        with app.app_context():
+            assert str(babel.get_locale()) == 'de_DE'
+    finally:
+        semaphore.release()
+        thread.join()
+
+
+def test_refresh_during_force_locale():
+    app = flask.Flask(__name__)
+    b = babel.Babel(app)
+
+    @b.localeselector
+    def select_locale():
+        return 'de_DE'
+
+    with app.test_request_context():
+        with babel.force_locale('en_US'):
+            assert str(babel.get_locale()) == 'en_US'
+            babel.refresh()
+            assert str(babel.get_locale()) == 'en_US'