14
0

Accepting request 344244 from home:matejcik:branches:devel:languages:python

- removed python-certifi dependency, we don't want to use it
- drop 0001-Don-t-pin-dependency-to-exact-version.patch because it's
  not needed anymore
- re-enable tests, re-add dependencies
  * don't exclude test_util.py
  * exclude proxy timeout tests that fail for spurious reasons
- urllib3-ssl-default-context.patch - use set_default_verify_paths()
  if no certificate path specified and verification not explicitly
  disabled
- urllib3-test-ssl-drop-sslv3.patch - don't use "SSLv3" constants
  as they are not supported in openssl (and conversely python) anymore
- ready-event.patch - fix race conditions in timeout tests

OBS-URL: https://build.opensuse.org/request/show/344244
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=12
This commit is contained in:
Jan Matejek
2015-11-13 14:47:50 +00:00
committed by Git OBS Bridge
parent 76e421f7d0
commit 5aad292d93
6 changed files with 188 additions and 41 deletions

View File

@@ -0,0 +1,13 @@
Index: urllib3-1.12/urllib3/util/ssl_.py
===================================================================
--- urllib3-1.12.orig/urllib3/util/ssl_.py
+++ urllib3-1.12/urllib3/util/ssl_.py
@@ -278,6 +278,8 @@ def ssl_wrap_socket(sock, keyfile=None,
if e.errno == errno.ENOENT:
raise SSLError(e)
raise
+ elif cert_reqs != ssl.CERT_NONE:
+ context.set_default_verify_paths()
if certfile:
context.load_cert_chain(certfile, keyfile)