python-urllib3: update to 1.10.2
Re-do unbundling without patch, with symlinks.
This commit is contained in:
Alessio Sergi
parent
6bcc0c5898
commit
6c9727bf61
|
|
@ -1,249 +0,0 @@
|
|||
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
|
||||
- from urllib3.packages import six
|
||||
+ import six
|
||||
if not six.PY3:
|
||||
line = line.encode('utf-8')
|
||||
parts = tornado.httputil._parseparam(';' + line)
|
||||
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',
|
||||
- 'urllib3.packages', 'urllib3.packages.ssl_match_hostname',
|
||||
'urllib3.contrib', 'urllib3.util',
|
||||
],
|
||||
requires=[],
|
||||
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
|
||||
-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 --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
|
||||
+import six
|
||||
|
||||
if six.PY3:
|
||||
raise SkipTest('Testing of PyOpenSSL disabled on PY3')
|
||||
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
|
||||
)
|
||||
-from urllib3.packages import six
|
||||
+import six
|
||||
xrange = six.moves.xrange
|
||||
|
||||
|
||||
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
|
||||
+from ssl import CertificateError
|
||||
from urllib3.exceptions import (
|
||||
ClosedPoolError,
|
||||
EmptyPoolError,
|
||||
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
|
||||
|
||||
from urllib3.fields import guess_content_type, RequestField
|
||||
-from urllib3.packages.six import u
|
||||
+from six import u
|
||||
|
||||
|
||||
class TestRequestField(unittest.TestCase):
|
||||
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
|
||||
-from urllib3.packages.six import b, u
|
||||
+from six import b, u
|
||||
|
||||
|
||||
BOUNDARY = '!! test boundary !!'
|
||||
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 --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
|
||||
|
||||
|
||||
-try: # Python 2.7+
|
||||
- from collections import OrderedDict
|
||||
-except ImportError:
|
||||
- from .packages.ordered_dict import OrderedDict
|
||||
-from .packages.six import iterkeys, itervalues
|
||||
+from collections import OrderedDict
|
||||
+from six import iterkeys, itervalues
|
||||
|
||||
|
||||
__all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
|
||||
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
|
||||
-from .packages import six
|
||||
+import six
|
||||
|
||||
try: # Python 3
|
||||
from http.client import HTTPConnection as _HTTPConnection, HTTPException
|
||||
@@ -40,7 +40,7 @@ from .exceptions import (
|
||||
SystemTimeWarning,
|
||||
SecurityWarning,
|
||||
)
|
||||
-from .packages.ssl_match_hostname import match_hostname
|
||||
+from ssl import match_hostname
|
||||
|
||||
from .util.ssl_ import (
|
||||
resolve_cert_reqs,
|
||||
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
|
||||
+from ssl import CertificateError
|
||||
+import six
|
||||
from .connection import (
|
||||
port_by_scheme,
|
||||
DummyConnection,
|
||||
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
|
||||
|
||||
-from .packages import six
|
||||
+import six
|
||||
|
||||
|
||||
def guess_content_type(filename, default='application/octet-stream'):
|
||||
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
|
||||
|
||||
-from .packages import six
|
||||
-from .packages.six import b
|
||||
+import six
|
||||
+from six import b
|
||||
from .fields import RequestField
|
||||
|
||||
writer = codecs.lookup('utf-8')[3]
|
||||
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
|
||||
-from .packages.six import string_types as basestring, binary_type
|
||||
+from six import string_types as basestring, binary_type
|
||||
from .connection import HTTPException, BaseSSLError
|
||||
from .util.response import is_fp_closed
|
||||
|
||||
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
|
||||
|
||||
-from ..packages.six import b
|
||||
+from six import b
|
||||
|
||||
ACCEPT_ENCODING = 'gzip,deflate'
|
||||
|
||||
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,
|
||||
ResponseError,
|
||||
)
|
||||
-from ..packages import six
|
||||
+import six
|
||||
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
|
|
@ -1,28 +1,38 @@
|
|||
# Template file for 'python-urllib3'
|
||||
pkgname=python-urllib3
|
||||
version=1.10.1
|
||||
version=1.10.2
|
||||
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-six ca-certificates"
|
||||
depends="python-six"
|
||||
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=631c6c52e8db04530e5b248ba4c1ce1aac100e2722bfbfdd35f212cf2783acb2
|
||||
checksum=5bfd0ee2bd559fc22e8f1273934aca77050de19ba0e77f2447cbb0dd44f06a16
|
||||
|
||||
post_install() {
|
||||
# replace bundled copy of six
|
||||
for pyver in $python_versions; do
|
||||
rm -f ${DESTDIR}/usr/lib/python${pyver}/site-packages/urllib3/packages/six.py
|
||||
ln -sf ../../six.py ${DESTDIR}/usr/lib/python${pyver}/site-packages/urllib3/packages/six.py
|
||||
done
|
||||
vlicense LICENSE.txt LICENSE
|
||||
}
|
||||
|
||||
python3.4-urllib3_package() {
|
||||
noarch=yes
|
||||
depends="python3.4-six ca-certificates"
|
||||
depends="python3.4-six"
|
||||
pycompile_version="3.4"
|
||||
pycompile_module="urllib3"
|
||||
short_desc="${short_desc/Python2/Python3.4}"
|
||||
pkg_install() {
|
||||
vmove usr/lib/python3.4
|
||||
vlicense ${wrksrc}/LICENSE.txt LICENSE
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue