diff --git a/srcpkgs/python-urllib3/patches/unbundle.patch b/srcpkgs/python-urllib3/patches/unbundle.patch
index a3973455e9..fc4158d038 100644
--- a/srcpkgs/python-urllib3/patches/unbundle.patch
+++ b/srcpkgs/python-urllib3/patches/unbundle.patch
@@ -1,15 +1,6 @@
-diff -Nur dev-requirements.txt dev-requirements.txt
---- dev-requirements.txt 2014-07-07 22:56:01.000000000 +0200
-+++ dev-requirements.txt 2014-08-19 02:10:38.507546859 +0200
-@@ -3,3 +3,5 @@
- tornado==3.2.2
- coverage==3.7.1
- tox==1.7.1
-+six
-+backports.ssl_match_hostname
diff -Nur dummyserver/handlers.py dummyserver/handlers.py
---- dummyserver/handlers.py 2014-07-07 22:56:01.000000000 +0200
-+++ dummyserver/handlers.py 2014-08-19 02:03:31.933539957 +0200
+--- dummyserver/handlers.py 2014-08-06 20:02:49.000000000 +0200
++++ dummyserver/handlers.py 2014-09-26 00:31:08.077758800 +0200
@@ -211,7 +211,7 @@
"""
import tornado.httputil
@@ -20,8 +11,8 @@ diff -Nur dummyserver/handlers.py dummyserver/handlers.py
line = line.encode('utf-8')
parts = tornado.httputil._parseparam(';' + line)
diff -Nur setup.py setup.py
---- setup.py 2014-07-07 22:56:01.000000000 +0200
-+++ setup.py 2014-08-19 01:51:36.502528381 +0200
+--- setup.py 2014-08-06 20:38:12.000000000 +0200
++++ setup.py 2014-09-26 00:35:06.139782615 +0200
@@ -42,7 +42,6 @@
url='http://urllib3.readthedocs.org/',
license='MIT',
@@ -30,9 +21,31 @@ diff -Nur setup.py setup.py
'urllib3.contrib', 'urllib3.util',
],
requires=[],
+diff -Nur test/__init__.py test/__init__.py
+--- test/__init__.py 2014-08-06 20:02:49.000000000 +0200
++++ test/__init__.py 2014-09-26 00:33:32.762949986 +0200
+@@ -7,7 +7,7 @@
+ from nose.plugins.skip import SkipTest
+
+ from urllib3.exceptions import MaxRetryError, HTTPWarning
+-from urllib3.packages import six
++import six
+
+ # We need a host that will not immediately close the connection with a TCP
+ # Reset. SO suggests this hostname
+diff -Nur test/contrib/test_pyopenssl.py test/contrib/test_pyopenssl.py
+--- test/contrib/test_pyopenssl.py 2014-09-13 20:18:29.000000000 +0200
++++ test/contrib/test_pyopenssl.py 2014-09-26 00:33:50.301730721 +0200
+@@ -1,5 +1,5 @@
+ from nose.plugins.skip import SkipTest
+-from urllib3.packages import six
++import six
+
+ if six.PY3:
+ raise SkipTest('Testing of PyOpenSSL disabled on PY3')
diff -Nur test/test_collections.py test/test_collections.py
---- test/test_collections.py 2014-03-15 01:05:07.000000000 +0100
-+++ test/test_collections.py 2014-08-19 01:52:16.527529028 +0200
+--- test/test_collections.py 2014-08-06 20:38:12.000000000 +0200
++++ test/test_collections.py 2014-09-26 00:28:36.830649649 +0200
@@ -4,7 +4,7 @@
HTTPHeaderDict,
RecentlyUsedContainer as Container
@@ -43,8 +56,8 @@ diff -Nur test/test_collections.py test/test_collections.py
diff -Nur test/test_connectionpool.py test/test_connectionpool.py
---- test/test_connectionpool.py 2014-07-07 22:56:01.000000000 +0200
-+++ test/test_connectionpool.py 2014-08-19 01:54:30.020531188 +0200
+--- test/test_connectionpool.py 2014-08-06 20:38:12.000000000 +0200
++++ test/test_connectionpool.py 2014-09-26 00:36:12.962947210 +0200
@@ -6,7 +6,10 @@
HTTPConnectionPool,
)
@@ -58,8 +71,8 @@ diff -Nur test/test_connectionpool.py test/test_connectionpool.py
ClosedPoolError,
EmptyPoolError,
diff -Nur test/test_fields.py test/test_fields.py
---- test/test_fields.py 2014-03-04 20:08:03.000000000 +0100
-+++ test/test_fields.py 2014-08-19 01:54:57.941531640 +0200
+--- test/test_fields.py 2014-08-06 20:38:12.000000000 +0200
++++ test/test_fields.py 2014-09-26 00:31:39.324368163 +0200
@@ -1,7 +1,7 @@
import unittest
@@ -70,8 +83,8 @@ diff -Nur test/test_fields.py test/test_fields.py
class TestRequestField(unittest.TestCase):
diff -Nur test/test_filepost.py test/test_filepost.py
---- test/test_filepost.py 2014-03-15 01:05:07.000000000 +0100
-+++ test/test_filepost.py 2014-08-19 01:55:14.829531913 +0200
+--- test/test_filepost.py 2014-08-06 20:38:12.000000000 +0200
++++ test/test_filepost.py 2014-09-26 00:30:35.582165050 +0200
@@ -2,7 +2,7 @@
from urllib3.filepost import encode_multipart_formdata, iter_fields
@@ -82,8 +95,8 @@ diff -Nur test/test_filepost.py test/test_filepost.py
BOUNDARY = '!! test boundary !!'
diff -Nur test/test_retry.py test/test_retry.py
---- test/test_retry.py 2014-07-07 22:56:01.000000000 +0200
-+++ test/test_retry.py 2014-08-19 01:56:07.295532762 +0200
+--- test/test_retry.py 2014-08-06 20:38:12.000000000 +0200
++++ test/test_retry.py 2014-09-26 00:33:15.642164025 +0200
@@ -1,6 +1,6 @@
import unittest
@@ -93,8 +106,8 @@ diff -Nur test/test_retry.py test/test_retry.py
from urllib3.exceptions import (
ConnectTimeoutError,
diff -Nur urllib3/_collections.py urllib3/_collections.py
---- urllib3/_collections.py 2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/_collections.py 2014-08-19 02:07:34.678543884 +0200
+--- urllib3/_collections.py 2014-08-06 20:38:12.000000000 +0200
++++ urllib3/_collections.py 2014-09-26 00:36:59.802361637 +0200
@@ -10,11 +10,8 @@
pass
@@ -109,9 +122,33 @@ diff -Nur urllib3/_collections.py urllib3/_collections.py
__all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
+diff -Nur urllib3/connection.py urllib3/connection.py
+--- urllib3/connection.py 2014-09-13 20:18:29.000000000 +0200
++++ urllib3/connection.py 2014-09-26 00:39:41.684337834 +0200
+@@ -3,7 +3,7 @@
+ import socket
+ from socket import timeout as SocketTimeout
+ import warnings
+-from .packages import six
++import six
+
+ try: # Python 3
+ from http.client import HTTPConnection as _HTTPConnection, HTTPException
+@@ -39,7 +39,10 @@
+ ConnectTimeoutError,
+ SystemTimeWarning,
+ )
+-from .packages.ssl_match_hostname import match_hostname
++try:
++ from ssl import match_hostname
++except ImportError:
++ from backports.ssl_match_hostname import match_hostname
+
+ from .util.ssl_ import (
+ resolve_cert_reqs,
diff -Nur urllib3/connectionpool.py urllib3/connectionpool.py
---- urllib3/connectionpool.py 2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/connectionpool.py 2014-08-19 01:57:57.899534552 +0200
+--- urllib3/connectionpool.py 2014-09-13 20:18:29.000000000 +0200
++++ urllib3/connectionpool.py 2014-09-26 00:37:59.884610505 +0200
@@ -26,8 +26,11 @@
TimeoutError,
InsecureRequestWarning,
@@ -126,26 +163,9 @@ diff -Nur urllib3/connectionpool.py urllib3/connectionpool.py
from .connection import (
port_by_scheme,
DummyConnection,
-diff -Nur urllib3/connection.py urllib3/connection.py
---- urllib3/connection.py 2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/connection.py 2014-08-19 01:59:00.332535562 +0200
-@@ -27,8 +27,11 @@
- from .exceptions import (
- ConnectTimeoutError,
- )
--from .packages.ssl_match_hostname import match_hostname
--from .packages import six
-+try:
-+ from ssl import match_hostname
-+except ImportError:
-+ from backports.ssl_match_hostname import match_hostname
-+import six
-
- from .util.ssl_ import (
- resolve_cert_reqs,
diff -Nur urllib3/fields.py urllib3/fields.py
---- urllib3/fields.py 2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/fields.py 2014-08-19 01:59:25.757535973 +0200
+--- urllib3/fields.py 2014-08-06 20:38:12.000000000 +0200
++++ urllib3/fields.py 2014-09-26 00:46:37.117144209 +0200
@@ -1,7 +1,7 @@
import email.utils
import mimetypes
@@ -156,8 +176,8 @@ diff -Nur urllib3/fields.py urllib3/fields.py
def guess_content_type(filename, default='application/octet-stream'):
diff -Nur urllib3/filepost.py urllib3/filepost.py
---- urllib3/filepost.py 2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/filepost.py 2014-08-19 02:00:05.271536613 +0200
+--- urllib3/filepost.py 2014-08-06 20:38:12.000000000 +0200
++++ urllib3/filepost.py 2014-09-26 00:29:56.885648823 +0200
@@ -3,8 +3,8 @@
from uuid import uuid4
from io import BytesIO
@@ -170,8 +190,8 @@ diff -Nur urllib3/filepost.py urllib3/filepost.py
writer = codecs.lookup('utf-8')[3]
diff -Nur urllib3/response.py urllib3/response.py
---- urllib3/response.py 2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/response.py 2014-08-19 02:00:38.448537150 +0200
+--- urllib3/response.py 2014-09-13 20:18:29.000000000 +0200
++++ urllib3/response.py 2014-09-26 00:30:18.828374502 +0200
@@ -4,7 +4,7 @@
from ._collections import HTTPHeaderDict
@@ -182,8 +202,8 @@ diff -Nur urllib3/response.py urllib3/response.py
from .util.response import is_fp_closed
diff -Nur urllib3/util/request.py urllib3/util/request.py
---- urllib3/util/request.py 2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/util/request.py 2014-08-19 02:00:57.616537460 +0200
+--- urllib3/util/request.py 2014-08-06 20:38:12.000000000 +0200
++++ urllib3/util/request.py 2014-09-26 00:32:27.729763013 +0200
@@ -1,6 +1,6 @@
from base64 import b64encode
@@ -193,8 +213,8 @@ diff -Nur urllib3/util/request.py urllib3/util/request.py
ACCEPT_ENCODING = 'gzip,deflate'
diff -Nur urllib3/util/retry.py urllib3/util/retry.py
---- urllib3/util/retry.py 2014-07-07 22:56:01.000000000 +0200
-+++ urllib3/util/retry.py 2014-08-19 02:01:18.385537796 +0200
+--- urllib3/util/retry.py 2014-09-13 20:18:29.000000000 +0200
++++ urllib3/util/retry.py 2014-09-26 00:32:56.069408718 +0200
@@ -7,7 +7,7 @@
ReadTimeoutError,
MaxRetryError,
diff --git a/srcpkgs/python-urllib3/template b/srcpkgs/python-urllib3/template
index 13035b055f..dd7a849e6e 100644
--- a/srcpkgs/python-urllib3/template
+++ b/srcpkgs/python-urllib3/template
@@ -1,25 +1,24 @@
# Template file for 'python-urllib3'
pkgname=python-urllib3
-version=1.9
+version=1.9.1
revision=1
noarch=yes
-wrksrc="${pkgname#*-}-${version}"
-build_style="python-module"
+wrksrc="urllib3-${version}"
+build_style=python-module
python_versions="2.7 3.4"
hostmakedepends="python-setuptools python3.4-setuptools"
-makedepends="python-backports-ssl-match-hostname python-six python3.4-six"
-depends="python python-backports-ssl-match-hostname python-six ca-certificates"
+depends="python-backports-ssl-match-hostname python-six ca-certificates"
pycompile_module="urllib3"
short_desc="HTTP library with thread-safe connection pooling (Python2)"
maintainer="Alessio Sergi <al3hex@gmail.com>"
homepage="https://github.com/shazow/urllib3"
license="MIT"
-distfiles="https://pypi.python.org/packages/source/u/urllib3/urllib3-${version}.tar.gz"
-checksum=4e400b2e2f53652dd0d8062ca5ecc425b6af6e96989b8d31f5dd875186aa247b
+distfiles="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz"
+checksum=d858379ef5988d4534bb8909432d697422100aaff272299d661339836b6dae9b
python3.4-urllib3_package() {
noarch=yes
- depends="python3.4 python3.4-six ca-certificates"
+ depends="python3.4-six ca-certificates"
pycompile_version="3.4"
pycompile_module="urllib3"
short_desc="${short_desc/Python2/Python3.4}"