[arch-commits] Commit in python-urllib3/trunk (PKGBUILD tornado-4.3.patch)

[Felix Yan]

    Date: Tuesday, June 5, 2018 @ 04:00:54
  Author: felixonmars
Revision: 325874

upgpkg: python-urllib3 1.23-1

Modified:
  python-urllib3/trunk/PKGBUILD
Deleted:
  python-urllib3/trunk/tornado-4.3.patch

-------------------+
 PKGBUILD          |   11 +++--------
 tornado-4.3.patch |   23 -----------------------
 2 files changed, 3 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-05 04:00:38 UTC (rev 325873)
+++ PKGBUILD	2018-06-05 04:00:54 UTC (rev 325874)
@@ -6,7 +6,7 @@
 
 pkgbase=python-urllib3
 pkgname=(python-urllib3 python2-urllib3 python-urllib3-doc)
-pkgver=1.22
+pkgver=1.23
 pkgrel=1
 pkgdesc="HTTP library with thread-safe connection pooling and file post support"
 arch=("any")
@@ -18,15 +18,10 @@
 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')
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/shazow/urllib3/archive/$pkgver.tar.gz"
-        tornado-4.3.patch)
-sha512sums=('1b45a4a64e71847a4fc62b9263235d5b05b62076698fa324454efeb7ad065abd702cc9eadb2d396d9270b07e91e9bad94c52a4b9b115aadccb27f81955e6feab'
-            '7c09acefa963a80379f8b2f3f2c2c7546ec62025058c1ae024bc954d49392d7956b8b3ceaed40b3d3ab06bcf9c74bfb4214425b66cc55c50ffc2642e2d35c498')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/shazow/urllib3/archive/$pkgver.tar.gz")
+sha512sums=('1d9eccdd2f939a1029fb6e49c45409b3a493f38b5880bba45a6e8a8088c0478190807b1fe7341b22abe363809ef41c5367de831de9618bcc62f34cb9f0cbc7af')
 
 prepare() {
-  # https://github.com/shazow/urllib3/pull/1236
-  (cd urllib3-$pkgver; patch -p1 -i ../tornado-4.3.patch)
-
   cp -a urllib3-$pkgver{,-py2}
 }
 

Deleted: tornado-4.3.patch
===================================================================
--- tornado-4.3.patch	2018-06-05 04:00:38 UTC (rev 325873)
+++ tornado-4.3.patch	2018-06-05 04:00:54 UTC (rev 325874)
@@ -1,23 +0,0 @@
-From 39eebb652db570cf51994f404da3dd91c8a9f4cc Mon Sep 17 00:00:00 2001
-From: Felix Yan <felixonmars at 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