Skip to content

bpo-40275: Remove duplicate import of locale module #19761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 6 commits into from
May 4, 2020
Merged

bpo-40275: Remove duplicate import of locale module #19761

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ef6eaf
Remove duplicate import of locale module
shihai1991 Apr 28, 2020
c84d1f9
retrigger checks
shihai1991 Apr 28, 2020
4a1471e
remove global import of locale module in test.support
shihai1991 Apr 29, 2020
04c0f82
retrigger checks
shihai1991 Apr 29, 2020
58d39a3
make lazy import locale in gettext
shihai1991 May 1, 2020
cef2725
Revert "make lazy import locale in gettext"
shihai1991 May 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove global import of locale module in test.support
  • Loading branch information
@shihai1991
shihai1991 committed Apr 29, 2020
commit 4a1471eec9240e799e7098679d31f9fbd976121a
3 changes: 2 additions & 1 deletion Lib/test/support/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import hashlib
import importlib
import importlib.util
import locale
import os
import platform
import re
Expand Down Expand Up @@ -1622,6 +1621,7 @@ def run_with_locale(catstr, *locales):
def decorator(func):
def inner(*args, **kwds):
try:
import locale
category = getattr(locale, catstr)
orig_locale = locale.setlocale(category)
except AttributeError:
Expand Down Expand Up @@ -2432,6 +2432,7 @@ def skip_if_buggy_ucrt_strfptime(test):
See bpo-37552 [Windows] strptime/strftime return invalid
results with UCRT version 17763.615
"""
import locale
global _buggy_ucrt
if _buggy_ucrt is None:
if(sys.platform == 'win32' and
Expand Down