diff options
| author | Benjamin Peterson <benjamin@python.org> | 2014-10-03 21:33:45 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2014-10-03 21:33:45 (GMT) |
| commit | 8b9cfa10662c7712f7685f4bc376ab65c119589b (patch) | |
| tree | e6e9fe1135a593580ad080c50b23ab8327e56fe7 /Lib/ssl.py | |
| parent | df75fee9a35c2ac33e94744216e0a49e8aa0bae4 (diff) | |
| parent | 5915b0f924152b4801c1fe49aff348fd1981cc05 (diff) | |
| download | cpython-8b9cfa10662c7712f7685f4bc376ab65c119589b.zip cpython-8b9cfa10662c7712f7685f4bc376ab65c119589b.tar.gz cpython-8b9cfa10662c7712f7685f4bc376ab65c119589b.tar.bz2 | |
merge 3.4 (#22449)
Diffstat (limited to 'Lib/ssl.py')
| -rw-r--r-- | Lib/ssl.py | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -379,8 +379,7 @@ class SSLContext(_SSLContext): if sys.platform == "win32": for storename in self._windows_cert_stores: self._load_windows_store_certs(storename, purpose) - else: - self.set_default_verify_paths() + self.set_default_verify_paths() def create_default_context(purpose=Purpose.SERVER_AUTH, *, cafile=None, |