Accepting request 447979 from devel:languages:python

1

OBS-URL: https://build.opensuse.org/request/show/447979
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-urllib3?expand=0&rev=10
This commit is contained in:
Ludwig Nussel 2016-12-29 21:52:44 +00:00 committed by Git OBS Bridge
commit 99632586bf
7 changed files with 200 additions and 38 deletions

View File

@ -1,3 +1,174 @@
-------------------------------------------------------------------
Wed Dec 28 08:08:14 UTC 2016 - tbechtold@suse.com
update to version 1.19.1
* Forgot to mention #955.
* Starting o the user guide.
* Add ipaddress marker to setup.cfg.
* CHANGES for #897
* Version added 1.17
* Change debug level to 'debug' to match ConnectionPool
* Moving some stuff to advanced usage.
* Ignore only the unused import error
* Uniform checks.
* Add test for past date in Retry-After header
* Adding all reference docs
* Ok, I just gotta see what's going on here.
* Adding app engine docs
* Keep using the good OpenSSL
* Adding timeout section
* Removing absolute import in NTLMPool
* Use the good OpenSSL.
* Small pass at contributing
* parse_url: Disallow non-integer digits explicitly in port numbers
* Fixup some whitespace.
* Updating copy on landing page.
* Fix flake8 E305 errors
* Use OS default certs when possible
* Fleshing out user guide.
* Fallback to the vendored ipaddress module.
* Updating intersphinx to python 3.4
* Seems like version mismatch is the issue.
* Improve the cipher suite comment
* Retry backoff time is calculated only from the last consecutive errors sequence
* Fix a typo in the user guide documentation
* Update docs guide with new dependencies
* Tests for #979
* Remove HIGH cipher suites as well.
* Adding SSL verification section to user guide.
* More CHANGES
* Changes for #1017
* Changelog for #1009.
* Vendor a backport of the ipaddress module.
* CHANGES for 1.19
* Fixed typos
* Revert "Fallback to the vendored ipaddress module."
* Use "with" to close more files eagerly and also on error
* Addressing review comments
* First stab at the new index page
* Removing unneeded scratch file.
* Fixing some references
* Moving some stuff around.
* CR fixes
* Remove 100% requirement from nosetests.
* Try using codecov
* Remove absolute import.
* Split ciphers up to individual lines.
* add warning when timeout without total is used on App Engine
* We don't want a sad @haikuginger
* RequestHistory is a namedtuple instance.
* I wonder if we're missing this.
* Switching to alabaster theme
* Prefer user-supplied host headers.
* Try shoving it in tox.ini
* Add include=urllib3/* to prevent core module coverage through six.moves
* Pointing flake8 specifically at the urllib3 package
* CHANGES for #955
* Sorry PyPy.
* Add support for ChaCha20.
* Make Travis CI fail if docs have warnings or errors
* Added CHANGES entry
* Test with OpenSSL 1.1 on Mac.
* Backport Python 3.5 match_hostname function.
* Wrap lines to under 99 chars
* Moving docs creation into tox
* Gotta use the pyenv everywhere.
* Explicitly check if a value in a multipart header is None instead of just a falsy value
* Move to a more complex bit of idna handling.
* Make codecov enforce 100% coverage.
* Error if GAE_PYTHONPATH is not set when running make test-gae
* Changes for #258.
* adding length_remaining functionality to HTTPResponse
* test TLSv1 instead of SSLv3
* fixing infinite loop when stream(None) called
* Adding proxy section
* Don't forget setup.cfg
* Removing TODO
* add changelog for #978
* Stop testing our parsing via TLS failure.
* CHANGES for #928
* Add support for OS X.
* While I'm shotgun debugging.
* Merging new release version: 1.19.1
* Clean up some bugs.
* Support date in Retry-After header
* Defer to URLFetch's default timeout instead of hard coding 5s.
* Update Travis PyPy testing to 5.4
* Remove 3DES support.
* Seems like Python 2.6 doesn't like -m pip
* Adding logging and exceptions.
* changing conditional order to prefer isclosed over closed
* Have the 'secure' flag install ipaddress.
* Respect Retry-After header for redirection
* Respect Retry-After header
* Correct the import of urljoin for Python 3
* use dunder slots for Url class slots variable
* Update README.rst to better reflect new documentation.
* Allow PyPy 5.3 to fail
* updating CHANGES and CONTRIBUTORS
* Clarifying a few things.
* Revert "Remove ipaddress marker."
* Fix GAE_PYTHONPATH error in Makefile
* Removing symlinks from dummyserver certs to fix test suite on Windows
* adding in exception for booleans and zero values in timeouts
* CHANGES for #930
* add domain and method aware logging to connectionpool (#897)
* Add release note about #941 (#943)
* Make HTTPResponse.stream() work with file-like body of non-HTTPResponse type (eg StringIO)
* Use HTTPException, LifoQueue, Empty, and Full from six
* CHANGES for #858 and #887
* Updating links to SSL warning help page. Fixes #918
* More alabaster customizations, starting on TOC
* CHANGES for #835
* It's possible but unlikely that we need combine
* We actually require cryptography-based PyOpenSSL now.
* PySocks 1.5.7 causes problems with IPv6.
* fixing socks and ssl docstrings.
* Fix doc syntax in user-guide.rst
* Urllib3 -> urllib3
* Removing uneeded files.
* Dear tox: plz propagate env vars. Thanks.
* Favour our own match_hostname over old versions.
* Bow before our fruit overlords.
* enforce_content_length for incrementally read responses
* fixing incorrect message for IncompleteRead
* Update setup.cfg
* Changelog for #986.
* Spelling fixes
* Line breaks.
* Adding docs/requirements.txt for readthedocs.
* CHANGES for #989.
* Normalize the scheme and host in the URL parser
* Update changes for 1.17
* Changes for #979
* Changelog update for #947.
* Update connectionpool.py
* Make BodyNotHttplibCompatible inherit from HttpError, urllib3's base exception class, only
* Update changes for 1.18
* Update PyOpenSSL to not use ndg-httpsclient or pyasn1
* Retry history changed from list to tuple
* Add a cert with IP SAN and test for it.
* parse_retry_after: Disallow non-integer digits, allow whitespace
* Add failing test for #1009.
* Remove markers from setup.py.
* Use Travis supplied PyPy 5.3
* Support retry for 413, 429 and 503 status code
* Remove ipaddress marker.
* Revert "Vendor a backport of the ipaddress module."
* Adding retry section
* CVE-2016-9015: Correct set verify flags.
* Update CHANGES.rst for #911
* Tests for case-insensitivity in the scheme and host
* Add changelog for #967.
* Try updating setuptools.
* Updating flake8 locations
* Forward-port 1.18.1 changelog.
* Update [secure] extra.
* Add more advanced usage docs
* CHANGES for #990
* [contrib/pyopenssl] remove unused ssl_wrap_socket
* Import more from six
-------------------------------------------------------------------
Thu Sep 1 19:12:32 UTC 2016 - tbechtold@suse.com

View File

@ -17,7 +17,7 @@
Name: python-urllib3
Version: 1.16
Version: 1.19.1
Release: 0
Summary: HTTP library with thread-safe connection pooling, file post, and more
License: MIT
@ -39,6 +39,7 @@ BuildRequires: python-nose-exclude >= 0.4.1
BuildRequires: python-tornado >= 4.2.1
Recommends: python-pyOpenSSL
Recommends: python-pyasn1
Recommends: python-cryptography
Recommends: python-ndg-httpsclient
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
@ -89,7 +90,8 @@ PYTHONPATH="%{buildroot}%{python_sitelib}" nosetests \
--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 \
--exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestIPv6HTTPProxyManager
--exclude-test=test.with_dummyserver.test_proxy_poolmanager.TestIPv6HTTPProxyManager \
--exclude-test=test.with_dummyserver.test_https.TestHTTPS_IPSAN
#%pre
# previous versions of the package installed .egg-info as a directory,

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:63d479478ddfc83bbc11577dc16d47835c5179ac13e550118ca143b62c4bf9ab
size 179763

3
urllib3-1.19.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:53bc34c8ee268c3bd83ecf5e9c80fa783f3148484579bd4e20f4a7c1bb2dd6a0
size 187416

View File

@ -1,13 +1,21 @@
Index: b/urllib3/util/ssl_.py
Index: urllib3-1.19.1/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,
--- urllib3-1.19.1.orig/urllib3/util/ssl_.py
+++ urllib3-1.19.1/urllib3/util/ssl_.py
@@ -314,9 +314,13 @@ 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'):
- elif getattr(context, 'load_default_certs', None) is not None:
- # try to load OS default certs; works well on Windows (require Python3.4+)
- context.load_default_certs()
+ else:
+ if cert_reqs != ssl.CERT_NONE and hasattr(context, 'set_default_verify_paths'):
+ context.set_default_verify_paths()
+
+ if getattr(context, 'load_default_certs', None) is not None:
+ # try to load OS default certs; works well on Windows (require Python3.4+)
+ context.load_default_certs()
if certfile:
context.load_cert_chain(certfile, keyfile)

View File

@ -1,13 +1,12 @@
Index: b/setup.cfg
Index: urllib3-1.19.1/setup.cfg
===================================================================
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,9 +1,5 @@
--- urllib3-1.19.1.orig/setup.cfg
+++ urllib3-1.19.1/setup.cfg
@@ -1,8 +1,5 @@
[nosetests]
logging-clear-handlers = true
-with-coverage = true
-cover-package = urllib3
-cover-min-percentage = 100
-cover-erase = true
[flake8]

View File

@ -1,8 +1,8 @@
Index: b/test/with_dummyserver/test_https.py
Index: urllib3-1.19.1/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
--- urllib3-1.19.1.orig/test/with_dummyserver/test_https.py
+++ urllib3-1.19.1/test/with_dummyserver/test_https.py
@@ -465,7 +465,7 @@ class TestHTTPS(HTTPSDummyServerTestCase
class TestHTTPS_TLSv1(HTTPSDummyServerTestCase):
certs = DEFAULT_CERTS.copy()
@ -11,21 +11,3 @@ Index: b/test/with_dummyserver/test_https.py
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):