From: Antoine Pitrou Date: Mon, 1 Apr 2013 16:54:45 +0000 (+0200) Subject: Backed out changeset 4fcd50a6dca7 as it totally breaks the test suite here. X-Git-Tag: v3.4.0a1~1051^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d197de987ff97de90a855c933de0e1ed8deb4fb;p=python Backed out changeset 4fcd50a6dca7 as it totally breaks the test suite here. --- 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('.', '_')