From d71d604d19b63605e989e85acb79476fcd036496 Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Sat, 23 Mar 2024 22:41:22 +0900 Subject: [PATCH] =?UTF-8?q?app:=20change=20locale.getdefaultlocale=20?= =?UTF-8?q?=E2=86=92=20locale.getlocale?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ayame/app.py | 4 ++-- tests/test_app.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ayame/app.py b/ayame/app.py index 4affda0..a4835d5 100644 --- a/ayame/app.py +++ b/ayame/app.py @@ -1,7 +1,7 @@ # # ayame.app # -# Copyright (c) 2011-2023 Akinori Hattori +# Copyright (c) 2011-2024 Akinori Hattori # # SPDX-License-Identifier: MIT # @@ -171,7 +171,7 @@ def _parse_locales(self, environ): v = values[0][0] sep = '-' else: - v = locale.getdefaultlocale()[0] + v = locale.getlocale()[0] sep = '_' if v: v = v.split(sep, 1) diff --git a/tests/test_app.py b/tests/test_app.py index 5792ad2..488412a 100644 --- a/tests/test_app.py +++ b/tests/test_app.py @@ -20,7 +20,7 @@ class AppTestCase(AyameTestCase): def setUp(self): - self.locale = locale.getdefaultlocale()[0] + self.locale = locale.getlocale()[0] if self.locale: v = self.locale.split('_', 1) self.locale = (v[0].lower(), v[1].upper()) if len(v) > 1 else (v[0].lower() if len(v) == 1 else None, None) @@ -134,9 +134,9 @@ def test_request_put(self): request.session self.assertEqual(request.locale, self.locale) - @unittest.mock.patch('locale.getdefaultlocale') - def test_request_posix_locale(self, getdefaultlocale): - getdefaultlocale.return_value = (None, None) + @unittest.mock.patch('locale.getlocale') + def test_request_posix_locale(self, getlocale): + getlocale.return_value = (None, None) environ = self.new_environ(method='GET') request = ayame.Request(environ, {})