Skip to content

Commit

Permalink
app: change locale.getdefaultlocale → locale.getlocale
Browse files Browse the repository at this point in the history
  • Loading branch information
hattya committed Mar 23, 2024
1 parent 2b57481 commit d71d604
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ayame/app.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# ayame.app
#
# Copyright (c) 2011-2023 Akinori Hattori <hattya@gmail.com>
# Copyright (c) 2011-2024 Akinori Hattori <hattya@gmail.com>
#
# SPDX-License-Identifier: MIT
#
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions tests/test_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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, {})
Expand Down

0 comments on commit d71d604

Please sign in to comment.