Hello community, here is the log from the commit of package python3-urllib3 for openSUSE:Factory checked in at 2016-03-26 15:08:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-urllib3 (Old) and /work/SRC/openSUSE:Factory/.python3-urllib3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-urllib3" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-urllib3/python3-urllib3.changes 2016-01-04 09:21:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-urllib3.new/python3-urllib3.changes 2016-03-26 15:08:21.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Mar 2 17:10:00 UTC 2016 - jmate...@suse.com + +- synchronize spec file and patches with python2 version: + * enable most tests + * urllib3-ssl-default-context.patch: use ssl's default context + for native ssl the same way it is used for pyopenssl + * urllib3-test-ssl-drop-sslv3.patch: do not use SSLv3 protocol + * drop unneeded 0001-Don-t-pin-dependency-to-exact-version.patch +- not adding optional dependencies of the pyopenssl module, because + ndg-httpsclient doesn't exist yet, so the pyopenssl module is unusable + +------------------------------------------------------------------- Old: ---- 0001-Don-t-pin-dependency-to-exact-version.patch New: ---- urllib3-ssl-default-context.patch urllib3-test-ssl-drop-sslv3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-urllib3.spec ++++++ --- /var/tmp/diff_new_pack.8M04j8/_old 2016-03-26 15:08:22.000000000 +0100 +++ /var/tmp/diff_new_pack.8M04j8/_new 2016-03-26 15:08:22.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python3-urllib3 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,12 @@ Group: Development/Languages/Python Url: http://urllib3.readthedocs.org/ Source: https://pypi.python.org/packages/source/u/urllib3/urllib3-%{version}.tar.gz -# PATCH-FIX-UPSTREAM speili...@suse.com -- https://github.com/shazow/urllib3/pull/361 -Patch0: 0001-Don-t-pin-dependency-to-exact-version.patch # PATCH-FIX-OPENSUSE speili...@suse.com -- We need no coverage report Patch1: urllib3-test-no-coverage.patch +# PATCH-FEATURE-UPSTREAM -- use set_default_verify_paths() if no certificate path is supplied +Patch2: urllib3-ssl-default-context.patch +# PATCH-FIX-OPENSUSE -- do not use unsupported SSLv3 in tests +Patch3: urllib3-test-ssl-drop-sslv3.patch BuildRequires: python3-devel # Test requirements: BuildRequires: python3-mock >= 1.3.0 @@ -56,8 +58,9 @@ %prep %setup -q -n urllib3-%{version} -%patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build python3 setup.py build @@ -65,10 +68,19 @@ %install python3 setup.py install --prefix=%{_prefix} --root=%{buildroot} -# Disable tests; require network -#%check -#rm -rf build -#PYTHONPATH="%{buildroot}%{python3_sitelib}" nosetests -I test_util.py +%check +rm -rf build +PYTHONPATH="%{buildroot}%{python_sitelib}" nosetests \ + --exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestHTTPProxyManager.test_https_proxy_timeout \ + --exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestHTTPProxyManager.test_https_proxy_pool_timeout \ +%if 0%{?suse_version} && 0%{?suse_version} <= 1320 + --exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestIPv6HTTPProxyManager.test_basic_ipv6_proxy \ +%endif + --exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestHTTPProxyManager.test_headerdict \ + --exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestHTTPProxyManager.test_headers \ + --exclude-test=test.with_dummyserver.test_poolmanager.TestPoolManager.test_headers \ + --exclude-test=test.with_dummyserver.test_https.TestHTTPS_IPv6Addr \ + --ignore-files=test_socks.py %files %defattr(-,root,root,-) ++++++ urllib3-ssl-default-context.patch ++++++ Index: b/urllib3/util/ssl_.py =================================================================== --- a/urllib3/util/ssl_.py +++ b/urllib3/util/ssl_.py @@ -299,6 +299,8 @@ def ssl_wrap_socket(sock, keyfile=None, if e.errno == errno.ENOENT: raise SSLError(e) raise + elif cert_reqs != ssl.CERT_NONE and hasattr(context, 'set_default_verify_paths'): + context.set_default_verify_paths() if certfile: context.load_cert_chain(certfile, keyfile) ++++++ urllib3-test-ssl-drop-sslv3.patch ++++++ Index: b/test/with_dummyserver/test_https.py =================================================================== --- a/test/with_dummyserver/test_https.py +++ b/test/with_dummyserver/test_https.py @@ -425,21 +425,21 @@ class TestHTTPS(HTTPSDummyServerTestCase class TestHTTPS_TLSv1(HTTPSDummyServerTestCase): certs = DEFAULT_CERTS.copy() - certs['ssl_version'] = ssl.PROTOCOL_TLSv1 + certs['ssl_version'] = ssl.PROTOCOL_TLSv1_2 def setUp(self): self._pool = HTTPSConnectionPool(self.host, self.port) - def test_set_ssl_version_to_sslv3(self): - self._pool.ssl_version = ssl.PROTOCOL_SSLv3 + def test_set_ssl_version_to_tlsv1(self): + self._pool.ssl_version = ssl.PROTOCOL_TLSv1 self.assertRaises(SSLError, self._pool.request, 'GET', '/') def test_ssl_version_as_string(self): - self._pool.ssl_version = 'PROTOCOL_SSLv3' + self._pool.ssl_version = 'PROTOCOL_TLSv1' self.assertRaises(SSLError, self._pool.request, 'GET', '/') def test_ssl_version_as_short_string(self): - self._pool.ssl_version = 'SSLv3' + self._pool.ssl_version = 'TLSv1' self.assertRaises(SSLError, self._pool.request, 'GET', '/') def test_discards_connection_on_sslerror(self):
