Accepting request 699612 from home:mcepl:branches:devel:languages:python

- Updated to 1.25.2:
  - Add support for Google's Brotli package.
    (gh#urllib3/urllib3#1572, gh#urllib3/urllib3#1579)
  - Upgrade bundled rfc3986 to v1.3.1 (gh#urllib3/urllib3#1578)
- Add fix-tests-no-fail-bpo-30458.patch to work around our Python
  has fixed bpo#30458.

OBS-URL: https://build.opensuse.org/request/show/699612
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-urllib3?expand=0&rev=61

fix-tests-no-fail-bpo-30458.patch

@@ -0,0 +1,11 @@
+--- a/test/with_dummyserver/test_connectionpool.py
++++ b/test/with_dummyserver/test_connectionpool.py
+@@ -689,7 +689,7 @@ class TestConnectionPool(HTTPDummyServer
+         for addr in INVALID_SOURCE_ADDRESSES:
+             pool = HTTPConnectionPool(self.host, self.port, source_address=addr, retries=False)
+             # FIXME: This assert flakes sometimes. Not sure why.
+-            self.assertRaises(NewConnectionError,
++            self.assertRaises((NewConnectionError, ValueError),
+                               pool.request,
+                               'GET', '/source_address?{0}'.format(addr))
+ 

python-urllib3-recent-date.patch

@@ -15,7 +15,7 @@ Fixes #1303
 
 --- a/src/urllib3/connection.py
 +++ b/src/urllib3/connection.py
-@@ -59,7 +59,7 @@ port_by_scheme = {
+@@ -60,7 +60,7 @@ port_by_scheme = {
  # and not less than 6 months ago.
  # Example: if Today is 2018-01-01, then RECENT_DATE should be any date on or
  # after 2016-01-01 (today - 2 years) AND before 2017-07-01 (today - 6 months)

python-urllib3.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Apr 30 12:27:37 CEST 2019 - Matej Cepl <mcepl@suse.com>
+
+- Updated to 1.25.2:
+  - Add support for Google's Brotli package.
+    (gh#urllib3/urllib3#1572, gh#urllib3/urllib3#1579)
+  - Upgrade bundled rfc3986 to v1.3.1 (gh#urllib3/urllib3#1578)
+- Add fix-tests-no-fail-bpo-30458.patch to work around our Python
+  has fixed bpo#30458.
+
 -------------------------------------------------------------------
 Tue Apr 23 10:27:36 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 

python-urllib3.spec

@@ -31,7 +31,7 @@ Name:           python-urllib3-%{flavor}
 %else
 Name:           python-urllib3
 %endif
-Version:        1.25
+Version:        1.25.2
 Release:        0
 Summary:        HTTP library with thread-safe connection pooling, file post, and more
 License:        MIT
@@ -43,6 +43,10 @@ Source:         https://files.pythonhosted.org/packages/source/u/urllib3/urllib3
 Patch2:         urllib3-ssl-default-context.patch
 # PATCH-FIX-UPSTREAM python-urllib3-recent-date.patch gh#shazow/urllib3#1303, boo#1074247 dimstar@opensuse.org -- Fix test suite, use correct date
 Patch4:         python-urllib3-recent-date.patch
+# PATCH-FIX-OPENSUSE fix-tests-no-fail-bpo-30458.patch bsc#1130840 mcepl@suse.com
+# Work around the fact that the incorrect URL in question is caught
+# already by our Python itself.
+Patch5:         fix-tests-no-fail-bpo-30458.patch
 BuildRequires:  %{python_module PySocks}
 BuildRequires:  %{python_module psutil}
 BuildRequires:  %{python_module setuptools}
@@ -94,6 +98,7 @@ Highlights
 %setup -q -n urllib3-%{version}
 %patch2 -p1
 %patch4 -p1
+%patch5 -p1
 find . -type f -exec chmod a-x '{}' \;
 find . -name __pycache__ -type d -exec rm -fr {} +
 

urllib3-1.25.2.tar.gz

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

urllib3-1.25.tar.gz

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