mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

merge

Browse source
This commit is contained in:
Brett Cannon 2013-04-01 13:26:21 -04:00
commit a495b498af
2 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/test/regrtest.py
View file

@ -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:
'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:
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('.', '_')

14
Lib/urllib/request.py
View file

@ -143,16 +143,12 @@ def urlopen(url, data=None, timeout=socket._GLOBAL_DEFAULT_TIMEOUT,
raise ValueError('SSL support not available') raise ValueError('SSL support not available')
context = ssl.SSLContext(ssl.PROTOCOL_SSLv23) context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
context.options |= ssl.OP_NO_SSLv2 context.options |= ssl.OP_NO_SSLv2
if cafile or capath or cadefault: context.verify_mode = ssl.CERT_REQUIRED
context.verify_mode = ssl.CERT_REQUIRED if cafile or capath:
if cafile or capath: context.load_verify_locations(cafile, capath)
context.load_verify_locations(cafile, capath)
else:
context.set_default_verify_paths()
check_hostname = True
else: else:
check_hostname = False context.set_default_verify_paths()
https_handler = HTTPSHandler(context=context, check_hostname=check_hostname) https_handler = HTTPSHandler(context=context, check_hostname=True)
opener = build_opener(https_handler) opener = build_opener(https_handler)
elif _opener is None: elif _opener is None:
_opener = opener = build_opener() _opener = opener = build_opener()