Commit 7d197de9 authored by Antoine Pitrou's avatar Antoine Pitrou

Backed out changeset 4fcd50a6dca7 as it totally breaks the test suite here.

parent 2d556f56
...@@ -127,7 +127,6 @@ import builtins ...@@ -127,7 +127,6 @@ import builtins
import faulthandler import faulthandler
import io import io
import json import json
import locale
import logging import logging
import os import os
import platform import platform
...@@ -1062,7 +1061,7 @@ class saved_test_environment: ...@@ -1062,7 +1061,7 @@ class saved_test_environment:
'sys.warnoptions', 'threading._dangling', 'sys.warnoptions', 'threading._dangling',
'multiprocessing.process._dangling', 'multiprocessing.process._dangling',
'sysconfig._CONFIG_VARS', 'sysconfig._INSTALL_SCHEMES', 'sysconfig._CONFIG_VARS', 'sysconfig._INSTALL_SCHEMES',
'support.TESTFN', 'locale' 'support.TESTFN',
) )
def get_sys_argv(self): def get_sys_argv(self):
...@@ -1231,14 +1230,6 @@ class saved_test_environment: ...@@ -1231,14 +1230,6 @@ class saved_test_environment:
elif os.path.isdir(support.TESTFN): elif os.path.isdir(support.TESTFN):
shutil.rmtree(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): def resource_info(self):
for name in self.resources: for name in self.resources:
method_suffix = name.replace('.', '_') method_suffix = name.replace('.', '_')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment