From fbd64649b17ae4b654cf07f02bfdf3b4d90d3ab4 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sun, 4 Oct 2020 14:05:23 +0000
Subject: python-urllib3: update to 1.25.10

---
 abs/core/python_modules/python-urllib3/PKGBUILD    | 33 ++++++++++------------
 .../python-urllib3/tornado-4.3.patch               | 23 ---------------
 2 files changed, 15 insertions(+), 41 deletions(-)
 delete mode 100644 abs/core/python_modules/python-urllib3/tornado-4.3.patch

diff --git a/abs/core/python_modules/python-urllib3/PKGBUILD b/abs/core/python_modules/python-urllib3/PKGBUILD
index e4af9f4..1022f05 100644
--- a/abs/core/python_modules/python-urllib3/PKGBUILD
+++ b/abs/core/python_modules/python-urllib3/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Felix Yan <felixonmars@archlinux.org>
 # Contributor: Patrice Peterson <runiq at archlinux dot us>
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
@@ -6,7 +5,7 @@
 
 pkgbase=python-urllib3
 pkgname=(python-urllib3 python2-urllib3 python-urllib3-doc)
-pkgver=1.22
+pkgver=1.25.10
 pkgrel=1
 pkgdesc="HTTP library with thread-safe connection pooling and file post support"
 arch=("any")
@@ -14,19 +13,17 @@ url="https://github.com/shazow/urllib3"
 license=("MIT")
 makedepends=('python-setuptools' 'python2-setuptools' 'python2-sphinx' 'python-ndg-httpsclient'
              'python2-ndg-httpsclient' 'python-pyasn1' 'python2-pyasn1' 'python-pyopenssl'
-             'python2-pyopenssl' 'python-pysocks' 'python2-pysocks' 'python-mock' 'python2-mock')
-checkdepends=('python-pytest-runner' 'python2-pytest-runner' 'python-tornado' 'python2-tornado'
-              'python-nose' 'python2-nose' 'python-psutil' 'python2-psutil'
-              'python-gcp-devrel-py-tools' 'python2-gcp-devrel-py-tools')
+             'python2-pyopenssl' 'python-pysocks' 'python2-pysocks' 'python-mock' 'python2-mock'
+             'python-brotli')
+checkdepends=('python-pytest-runner' 'python-tornado' 'python-nose' 'python-psutil' 'python-trustme'
+              'python-gcp-devrel-py-tools' 'python-pytest-timeout' 'python-flaky')
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/shazow/urllib3/archive/$pkgver.tar.gz"
-        tornado-4.3.patch)
-sha512sums=('1b45a4a64e71847a4fc62b9263235d5b05b62076698fa324454efeb7ad065abd702cc9eadb2d396d9270b07e91e9bad94c52a4b9b115aadccb27f81955e6feab'
-            '7c09acefa963a80379f8b2f3f2c2c7546ec62025058c1ae024bc954d49392d7956b8b3ceaed40b3d3ab06bcf9c74bfb4214425b66cc55c50ffc2642e2d35c498')
+        urllib3-use-brotli.patch::https://github.com/urllib3/urllib3/pull/1620.patch)
+sha512sums=('7927e58de8ef24474179297e6ef7700bb3026a13d578e5bb01e32c6c4b6b5e70cc35980a815e3bcd976678e344250222d38fb86abe0f956e5023deb0f80bc1a1'
+            '86f1dc1c8391a8dc9e9de5ff5243abe10579e363083b496aa3740def20e90969fcb470cbc50c1e0062317b235a697dba5f474d0fe635f94497aeac9abd07a414')
 
 prepare() {
-  # https://github.com/shazow/urllib3/pull/1236
-  (cd urllib3-$pkgver; patch -p1 -i ../tornado-4.3.patch)
-
+  patch -d urllib3-$pkgver -p1 -i ../urllib3-use-brotli.patch
   cp -a urllib3-$pkgver{,-py2}
 }
 
@@ -43,16 +40,15 @@ build() {
 }
 
 check() {
-  cd "$srcdir"/urllib3-$pkgver
+  cd urllib3-$pkgver
   python setup.py pytest
-
-  cd "$srcdir"/urllib3-$pkgver-py2
-  python2 setup.py pytest
 }
 
 package_python-urllib3() {
   depends=('python')
-  optdepends=('python-pysocks: SOCKS support')
+  optdepends=('python-pysocks: SOCKS support'
+              'python-brotli: Brotli support'
+              'python-pyopenssl: security support')
 
   cd urllib3-$pkgver
   python setup.py install --root="$pkgdir"
@@ -61,7 +57,8 @@ package_python-urllib3() {
 
 package_python2-urllib3() {
   depends=('python2')
-  optdepends=('python2-pysocks: SOCKS support')
+  optdepends=('python2-pysocks: SOCKS support'
+              'python2-pyopenssl: security support')
 
   cd urllib3-$pkgver-py2
   python2 setup.py install --root="$pkgdir"
diff --git a/abs/core/python_modules/python-urllib3/tornado-4.3.patch b/abs/core/python_modules/python-urllib3/tornado-4.3.patch
deleted file mode 100644
index 7f4a669..0000000
--- a/abs/core/python_modules/python-urllib3/tornado-4.3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 39eebb652db570cf51994f404da3dd91c8a9f4cc Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars@archlinux.org>
-Date: Fri, 21 Jul 2017 23:25:35 +0800
-Subject: [PATCH] Fix compatibility with tornado 4.3+
-
-`HTTPHeaders` is not JSON serializable, so make it a dict first.
----
- dummyserver/handlers.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dummyserver/handlers.py b/dummyserver/handlers.py
-index a943b836b..b91fe7215 100644
---- a/dummyserver/handlers.py
-+++ b/dummyserver/handlers.py
-@@ -225,7 +225,7 @@ def encodingrequest(self, request):
-         return Response(data, headers=headers)
- 
-     def headers(self, request):
--        return Response(json.dumps(request.headers))
-+        return Response(json.dumps(dict(request.headers)))
- 
-     def successful_retry(self, request):
-         """ Handler which will return an error and then success
-- 
cgit v0.12

