jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

python-urllib3: update to 1.10

Browse source
This commit is contained in:
Alessio Sergi 2014-12-16 21:21:21 +01:00
parent 5eae810495
commit 7285dbc0bc
2 changed files with 107 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

185
srcpkgs/python-urllib3/patches/unbundle.patch
View file

@ -1,7 +1,8 @@
diff -Nur dummyserver/handlers.py dummyserver/handlers.py
--- 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 @@
diff --git dummyserver/handlers.py dummyserver/handlers.py
index 72faa1a..ea15a1e 100644
--- dummyserver/handlers.py
+++ dummyserver/handlers.py
@@ -211,7 +211,7 @@ def _parse_header(line):
"""
import tornado.httputil
import email.utils
@ -10,10 +11,11 @@ diff -Nur dummyserver/handlers.py dummyserver/handlers.py
if not six.PY3:
line = line.encode('utf-8')
parts = tornado.httputil._parseparam(';' + line)
diff -Nur setup.py setup.py
--- setup.py 2014-08-06 20:38:12.000000000 +0200
+++ setup.py 2014-09-26 00:35:06.139782615 +0200
@@ -42,7 +42,6 @@
diff --git setup.py setup.py
index f638377..5e6fff1 100644
--- setup.py
+++ setup.py
@@ -42,7 +42,6 @@ setup(name='urllib3',
url='http://urllib3.readthedocs.org/',
license='MIT',
packages=['urllib3',
@ -21,10 +23,11 @@ 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 @@
diff --git test/__init__.py test/__init__.py
index d56a4d3..85db6c4 100644
--- test/__init__.py
+++ test/__init__.py
@@ -7,7 +7,7 @@ import socket
from nose.plugins.skip import SkipTest
from urllib3.exceptions import MaxRetryError, HTTPWarning
@ -33,9 +36,10 @@ diff -Nur test/__init__.py test/__init__.py
# 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
diff --git test/contrib/test_pyopenssl.py test/contrib/test_pyopenssl.py
index 5d57527..f23ff19 100644
--- test/contrib/test_pyopenssl.py
+++ test/contrib/test_pyopenssl.py
@@ -1,5 +1,5 @@
from nose.plugins.skip import SkipTest
-from urllib3.packages import six
@ -43,10 +47,11 @@ diff -Nur test/contrib/test_pyopenssl.py test/contrib/test_pyopenssl.py
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-08-06 20:38:12.000000000 +0200
+++ test/test_collections.py 2014-09-26 00:28:36.830649649 +0200
@@ -4,7 +4,7 @@
diff --git test/test_collections.py test/test_collections.py
index 4d173ac..c5420f7 100644
--- test/test_collections.py
+++ test/test_collections.py
@@ -4,7 +4,7 @@ from urllib3._collections import (
HTTPHeaderDict,
RecentlyUsedContainer as Container
)
@ -55,24 +60,23 @@ diff -Nur test/test_collections.py test/test_collections.py
xrange = six.moves.xrange
diff -Nur test/test_connectionpool.py test/test_connectionpool.py
--- 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 @@
diff --git test/test_connectionpool.py test/test_connectionpool.py
index a6dbcf4..43f9cbd 100644
--- test/test_connectionpool.py
+++ test/test_connectionpool.py
@@ -6,7 +6,7 @@ from urllib3.connectionpool import (
HTTPConnectionPool,
)
from urllib3.util.timeout import Timeout
-from urllib3.packages.ssl_match_hostname import CertificateError
+try:
+ from ssl import CertificateError
+except ImportError:
+ from backports.ssl_match_hostname import CertificateError
+from ssl import CertificateError
from urllib3.exceptions import (
ClosedPoolError,
EmptyPoolError,
diff -Nur test/test_fields.py test/test_fields.py
--- test/test_fields.py 2014-08-06 20:38:12.000000000 +0200
+++ test/test_fields.py 2014-09-26 00:31:39.324368163 +0200
diff --git test/test_fields.py test/test_fields.py
index cdec68b..66da148 100644
--- test/test_fields.py
+++ test/test_fields.py
@@ -1,7 +1,7 @@
import unittest
@ -82,10 +86,11 @@ 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-08-06 20:38:12.000000000 +0200
+++ test/test_filepost.py 2014-09-26 00:30:35.582165050 +0200
@@ -2,7 +2,7 @@
diff --git test/test_filepost.py test/test_filepost.py
index 390dbb3..ecc6710 100644
--- test/test_filepost.py
+++ test/test_filepost.py
@@ -2,7 +2,7 @@ import unittest
from urllib3.filepost import encode_multipart_formdata, iter_fields
from urllib3.fields import RequestField
@ -94,21 +99,37 @@ 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-08-06 20:38:12.000000000 +0200
+++ test/test_retry.py 2014-09-26 00:33:15.642164025 +0200
@@ -1,6 +1,6 @@
diff --git test/test_retry.py test/test_retry.py
index 421e508..8fcc287 100644
--- test/test_retry.py
+++ test/test_retry.py
@@ -1,7 +1,7 @@
import unittest
from urllib3.response import HTTPResponse
-from urllib3.packages.six.moves import xrange
+from six.moves import xrange
from urllib3.util.retry import Retry
from urllib3.exceptions import (
ConnectTimeoutError,
diff -Nur urllib3/_collections.py urllib3/_collections.py
--- 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 @@
diff --git test/with_dummyserver/test_connectionpool.py test/with_dummyserver/test_connectionpool.py
index cc0f011..85ede60 100644
--- test/with_dummyserver/test_connectionpool.py
+++ test/with_dummyserver/test_connectionpool.py
@@ -29,7 +29,7 @@ from urllib3.exceptions import (
ReadTimeoutError,
ProtocolError,
)
-from urllib3.packages.six import b, u
+from six import b, u
from urllib3.util.retry import Retry
from urllib3.util.timeout import Timeout
diff --git urllib3/_collections.py urllib3/_collections.py
index 784342a..51eb302 100644
--- urllib3/_collections.py
+++ urllib3/_collections.py
@@ -10,11 +10,8 @@ except ImportError: # Platform-specific: No threads available
pass
@ -116,16 +137,17 @@ diff -Nur urllib3/_collections.py urllib3/_collections.py
- from collections import OrderedDict
-except ImportError:
- from .packages.ordered_dict import OrderedDict
-from .packages.six import itervalues
-from .packages.six import iterkeys, itervalues
+from collections import OrderedDict
+from six import itervalues
+from six import iterkeys, itervalues
__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 @@
diff --git urllib3/connection.py urllib3/connection.py
index e5de769..44e8c1d 100644
--- urllib3/connection.py
+++ urllib3/connection.py
@@ -3,7 +3,7 @@ import sys
import socket
from socket import timeout as SocketTimeout
import warnings
@ -134,38 +156,34 @@ diff -Nur urllib3/connection.py urllib3/connection.py
try: # Python 3
from http.client import HTTPConnection as _HTTPConnection, HTTPException
@@ -39,7 +39,10 @@
ConnectTimeoutError,
@@ -40,7 +40,7 @@ from .exceptions import (
SystemTimeWarning,
SecurityWarning,
)
-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 ssl import match_hostname
from .util.ssl_ import (
resolve_cert_reqs,
diff -Nur urllib3/connectionpool.py urllib3/connectionpool.py
--- 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 @@
diff --git urllib3/connectionpool.py urllib3/connectionpool.py
index 8bdf228..dfdac97 100644
--- urllib3/connectionpool.py
+++ urllib3/connectionpool.py
@@ -26,8 +26,8 @@ from .exceptions import (
TimeoutError,
InsecureRequestWarning,
)
-from .packages.ssl_match_hostname import CertificateError
-from .packages import six
+try:
+ from ssl import CertificateError
+except ImportError:
+ from backports.ssl_match_hostname import CertificateError
+from ssl import CertificateError
+import six
from .connection import (
port_by_scheme,
DummyConnection,
diff -Nur urllib3/fields.py urllib3/fields.py
--- urllib3/fields.py 2014-08-06 20:38:12.000000000 +0200
+++ urllib3/fields.py 2014-09-26 00:46:37.117144209 +0200
diff --git urllib3/fields.py urllib3/fields.py
index c853f8d..5fe3c24 100644
--- urllib3/fields.py
+++ urllib3/fields.py
@@ -1,7 +1,7 @@
import email.utils
import mimetypes
@ -175,10 +193,11 @@ 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-08-06 20:38:12.000000000 +0200
+++ urllib3/filepost.py 2014-09-26 00:29:56.885648823 +0200
@@ -3,8 +3,8 @@
diff --git urllib3/filepost.py urllib3/filepost.py
index 0fbf488..97ab970 100644
--- urllib3/filepost.py
+++ urllib3/filepost.py
@@ -3,8 +3,8 @@ import codecs
from uuid import uuid4
from io import BytesIO
@ -189,10 +208,11 @@ diff -Nur urllib3/filepost.py urllib3/filepost.py
from .fields import RequestField
writer = codecs.lookup('utf-8')[3]
diff -Nur urllib3/response.py urllib3/response.py
--- 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 @@
diff --git urllib3/response.py urllib3/response.py
index e69de95..f432ddd 100644
--- urllib3/response.py
+++ urllib3/response.py
@@ -4,7 +4,7 @@ from socket import timeout as SocketTimeout
from ._collections import HTTPHeaderDict
from .exceptions import ProtocolError, DecodeError, ReadTimeoutError
@ -201,9 +221,10 @@ diff -Nur urllib3/response.py urllib3/response.py
from .connection import HTTPException, BaseSSLError
from .util.response import is_fp_closed
diff -Nur urllib3/util/request.py urllib3/util/request.py
--- urllib3/util/request.py 2014-08-06 20:38:12.000000000 +0200
+++ urllib3/util/request.py 2014-09-26 00:32:27.729763013 +0200
diff --git urllib3/util/request.py urllib3/util/request.py
index bc64f6b..5f4ccfd 100644
--- urllib3/util/request.py
+++ urllib3/util/request.py
@@ -1,6 +1,6 @@
from base64 import b64encode
@ -212,15 +233,17 @@ 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-09-13 20:18:29.000000000 +0200
+++ urllib3/util/retry.py 2014-09-26 00:32:56.069408718 +0200
@@ -7,7 +7,7 @@
diff --git urllib3/util/retry.py urllib3/util/retry.py
index 7e0959d..4dfdb32 100644
--- urllib3/util/retry.py
+++ urllib3/util/retry.py
@@ -8,7 +8,7 @@ from ..exceptions import (
ReadTimeoutError,
MaxRetryError,
ResponseError,
)
-from ..packages import six
+import six
log = logging.getLogger(__name__)

6
srcpkgs/python-urllib3/template
View file

@ -1,20 +1,20 @@
# Template file for 'python-urllib3'
pkgname=python-urllib3
version=1.9.1
version=1.10
revision=1
noarch=yes
wrksrc="urllib3-${version}"
build_style=python-module
python_versions="2.7 3.4"
hostmakedepends="python-setuptools python3.4-setuptools"
depends="python-backports-ssl-match-hostname python-six ca-certificates"
depends="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="${PYPI_SITE}/u/urllib3/urllib3-${version}.tar.gz"
checksum=d858379ef5988d4534bb8909432d697422100aaff272299d661339836b6dae9b
checksum=25b4a7fbbd9112e0190f31f8877aa0523caeab8630872ad1bbddaba01cdd6599
python3.4-urllib3_package() {
noarch=yes