summaryrefslogtreecommitdiff
path: root/Lib/test
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2013-04-01 13:26:21 -0400
committerBrett Cannon <brett@python.org>2013-04-01 13:26:21 -0400
commita495b498afa3ab0e2424cad0fb2fa3caacf7fd08 (patch)
tree5cac6d6c7a6bca4794b8532e3892fb7323dc6b9b /Lib/test
parentdaf4daa295b75b4f0c87b5051a59b0a81ba4dc70 (diff)
parent9a8d6934df77a6c45bd8d39e4919b93ba45e195d (diff)
downloadcpython-git-a495b498afa3ab0e2424cad0fb2fa3caacf7fd08.tar.gz
merge
Diffstat (limited to 'Lib/test')
-rwxr-xr-xLib/test/regrtest.py11
1 files changed, 1 insertions, 10 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 4f74780276..45b454116f 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -127,7 +127,6 @@ import builtins
import faulthandler
import io
import json
-import locale
import logging
import os
import platform
@@ -1062,7 +1061,7 @@ class saved_test_environment:
'sys.warnoptions', 'threading._dangling',
'multiprocessing.process._dangling',
'sysconfig._CONFIG_VARS', 'sysconfig._INSTALL_SCHEMES',
- 'support.TESTFN', 'locale'
+ 'support.TESTFN',
)
def get_sys_argv(self):
@@ -1231,14 +1230,6 @@ class saved_test_environment:
elif os.path.isdir(support.TESTFN):
shutil.rmtree(support.TESTFN)
- _locale_categories = [getattr(locale, lc)
- for lc in dir(locale) if lc.startswith('LC_')]
- def get_locale(self):
- return tuple(map(locale.getlocale, self._locale_categories))
- def restore_locale(self, saved):
- for category, setting in zip(self._locale_categories, saved):
- locale.setlocale(category, setting)
-
def resource_info(self):
for name in self.resources:
method_suffix = name.replace('.', '_')