23209250 Upgrade urllib3 to 1.15.1
authorLaszlo Peter <laszlo.peter@oracle.com>
Wed, 07 Sep 2016 14:48:40 -0700
changeset 6843 260146747afd
parent 6842 57457f4223c7
child 6844 5800d36b7861
23209250 Upgrade urllib3 to 1.15.1
components/python/urllib3/Makefile
components/python/urllib3/patches/remove_bundled_components.patch
components/python/urllib3/urllib3-PYVER.p5m
components/python/urllib3/urllib3.license
--- a/components/python/urllib3/Makefile	Wed Sep 07 14:48:40 2016 -0700
+++ b/components/python/urllib3/Makefile	Wed Sep 07 14:48:40 2016 -0700
@@ -26,16 +26,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		urllib3
-COMPONENT_VERSION=	1.10.4
+COMPONENT_VERSION=	1.15.1
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:52131e6a561466f1206e1a648d9a73dda2a804d0f70e83782bd88494542ded09
+    sha256:d0a1dc60433f7e9b90b4f085f1d45753174b4594558b29eda0009abe0b82da4c
 COMPONENT_ARCHIVE_URL=	$(call pypi_url)
-COMPONENT_PROJECT_URL=	http://pypi.python.org/pypi/urllib3/
+COMPONENT_PROJECT_URL=	https://github.com/shazow/urllib3
 COMPONENT_BUGDB=	python-mod/urllib3
 
-TPNO=			23153
+TPNO=			28746
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
--- a/components/python/urllib3/patches/remove_bundled_components.patch	Wed Sep 07 14:48:40 2016 -0700
+++ b/components/python/urllib3/patches/remove_bundled_components.patch	Wed Sep 07 14:48:40 2016 -0700
@@ -1,38 +1,35 @@
-In-house patch to remove the imports of local copies of six and ordered_dict.
+In-house patch to remove the imports of local copies of six and
+ordereddict. This is Solaris-specific and not suitable for upstream
+submission.
 
---- urllib3-1.10.4/urllib3/_collections.py.orig     2015-05-08 13:09:35.593680366 -0600
-+++ urllib3-1.10.4/urllib3/_collections.py     2015-05-08 13:10:02.486402310 -0600
[email protected]@ -10,11 +10,8 @@ except ImportError:  # Platform-specific
-             pass
-
-
--try:  # Python 2.7+
--    from collections import OrderedDict
--except ImportError:
+--- urllib3-1.15.1/urllib3/_collections.py.~1~	2016-04-06 12:16:56.000000000 -0700
++++ urllib3-1.15.1/urllib3/_collections.py	2016-06-21 16:53:35.000000000 -0700
[email protected]@ -14,8 +14,8 @@ except ImportError:  # Platform-specific
+ try:  # Python 2.7+
+     from collections import OrderedDict
+ except ImportError:
 -    from .packages.ordered_dict import OrderedDict
 -from .packages.six import iterkeys, itervalues, PY3
-+from collections import OrderedDict
++    from ordereddict import OrderedDict
 +from six import iterkeys, itervalues, PY3
-
-
+ 
+ 
  __all__ = ['RecentlyUsedContainer', 'HTTPHeaderDict']
-
---- urllib3-1.10.4/urllib3/connection.py.orig   2015-05-08 13:10:42.386855243 -0600
-+++ urllib3-1.10.4/urllib3/connection.py       2015-05-08 13:11:00.210452150 -0600
[email protected]@ -3,7 +3,7 @@ import sys
+--- urllib3-1.15.1/urllib3/connection.py.~1~	2016-04-06 12:16:56.000000000 -0700
++++ urllib3-1.15.1/urllib3/connection.py	2016-06-21 16:53:51.000000000 -0700
[email protected]@ -6,7 +6,7 @@ import sys
  import socket
- from socket import timeout as SocketTimeout
+ from socket import error as SocketError, timeout as SocketTimeout
  import warnings
 -from .packages import six
 +import six
-
+ 
  try:  # Python 3
-     from http.client import HTTPConnection as _HTTPConnection, HTTPException
-
---- urllib3-1.10.4/urllib3/connectionpool.py.orig       2015-05-08 13:12:22.805384141 -0600
-+++ urllib3-1.10.4/urllib3/connectionpool.py   2015-05-08 13:12:36.558475524 -0600
[email protected]@ -27,7 +27,7 @@ from .exceptions import (
-     InsecureRequestWarning,
+     from http.client import HTTPConnection as _HTTPConnection
+--- urllib3-1.15.1/urllib3/connectionpool.py.~1~	2016-04-06 12:16:56.000000000 -0700
++++ urllib3-1.15.1/urllib3/connectionpool.py	2016-06-21 16:54:10.000000000 -0700
[email protected]@ -31,7 +31,7 @@ from .exceptions import (
+     NewConnectionError,
  )
  from .packages.ssl_match_hostname import CertificateError
 -from .packages import six
@@ -40,63 +37,82 @@
  from .connection import (
      port_by_scheme,
      DummyConnection,
-
---- urllib3-1.10.4/urllib3/fields.py.orig       2015-05-08 13:17:35.832547496 -0600
-+++ urllib3-1.10.4/urllib3/fields.py   2015-05-08 13:17:46.167925955 -0600
[email protected]@ -1,7 +1,7 @@
+--- urllib3-1.15.1/urllib3/contrib/appengine.py.~1~	2015-12-29 12:28:18.000000000 -0800
++++ urllib3-1.15.1/urllib3/contrib/appengine.py	2016-06-21 16:54:28.000000000 -0700
[email protected]@ -12,7 +12,7 @@ from ..exceptions import (
+     SSLError
+ )
+ 
+-from ..packages.six import BytesIO
++from six import BytesIO
+ from ..request import RequestMethods
+ from ..response import HTTPResponse
+ from ..util.timeout import Timeout
+--- urllib3-1.15.1/urllib3/fields.py.~1~	2016-04-06 12:16:56.000000000 -0700
++++ urllib3-1.15.1/urllib3/fields.py	2016-06-21 16:54:54.000000000 -0700
[email protected]@ -2,7 +2,7 @@ from __future__ import absolute_import
  import email.utils
  import mimetypes
-
+ 
 -from .packages import six
 +import six
-
-
+ 
+ 
  def guess_content_type(filename, default='application/octet-stream'):
-
---- urllib3-1.10.4/urllib3/filepost.py.orig 2015-05-08 13:14:01.703344284 -0600
-+++ urllib3-1.10.4/urllib3/filepost.py 2015-05-08 13:14:16.319642917 -0600
[email protected]@ -3,8 +3,8 @@ import codecs
+--- urllib3-1.15.1/urllib3/filepost.py.~1~	2015-12-14 13:06:26.000000000 -0800
++++ urllib3-1.15.1/urllib3/filepost.py	2016-06-21 16:55:27.000000000 -0700
[email protected]@ -4,8 +4,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]
-
---- urllib3-1.10.4/urllib3/response.py.orig 2015-05-08 13:14:46.148251904 -0600
-+++ urllib3-1.10.4/urllib3/response.py 2015-05-08 13:14:58.056078256 -0600
[email protected]@ -10,7 +10,7 @@ from ._collections import HTTPHeaderDict
+--- urllib3-1.15.1/urllib3/response.py.~1~	2016-04-06 12:16:56.000000000 -0700
++++ urllib3-1.15.1/urllib3/response.py	2016-06-21 16:55:48.000000000 -0700
[email protected]@ -9,8 +9,8 @@ from ._collections import HTTPHeaderDict
  from .exceptions import (
      ProtocolError, DecodeError, ReadTimeoutError, ResponseNotChunked
  )
 -from .packages.six import string_types as basestring, binary_type, PY3
+-from .packages.six.moves import http_client as httplib
 +from six import string_types as basestring, binary_type, PY3
++from six.moves import http_client as httplib
  from .connection import HTTPException, BaseSSLError
- from .util.response import is_fp_closed
-
---- urllib3-1.10.4/urllib3/util/request.py.orig  2015-05-08 13:15:36.877580798 -0600
-+++ urllib3-1.10.4/urllib3/util/request.py  2015-05-08 13:15:43.538499579 -0600
[email protected]@ -1,6 +1,6 @@
+ from .util.response import is_fp_closed, is_response_to_head
+ 
+--- urllib3-1.15.1/urllib3/util/request.py.~1~	2015-12-14 13:06:26.000000000 -0800
++++ urllib3-1.15.1/urllib3/util/request.py	2016-06-21 16:55:59.000000000 -0700
[email protected]@ -1,7 +1,7 @@
+ from __future__ import absolute_import
  from base64 import b64encode
-
+ 
 -from ..packages.six import b
 +from six import b
-
+ 
  ACCEPT_ENCODING = 'gzip,deflate'
-
-
---- urllib3-1.10.4/urllib3/util/retry.py.orig  2015-05-08 13:16:14.384622856 -0600
-+++ urllib3-1.10.4/urllib3/util/retry.py    2015-05-08 13:16:22.531096314 -0600
[email protected]@ -8,7 +8,7 @@ from ..exceptions import (
+ 
+--- urllib3-1.15.1/urllib3/util/response.py.~1~	2015-12-29 12:28:18.000000000 -0800
++++ urllib3-1.15.1/urllib3/util/response.py	2016-06-21 16:56:58.000000000 -0700
[email protected]@ -1,5 +1,5 @@
+ from __future__ import absolute_import
+-from ..packages.six.moves import http_client as httplib
++from six.moves import http_client as httplib
+ 
+ from ..exceptions import HeaderParsingError
+ 
+--- urllib3-1.15.1/urllib3/util/retry.py.~1~	2016-04-06 12:16:56.000000000 -0700
++++ urllib3-1.15.1/urllib3/util/retry.py	2016-06-21 16:57:44.000000000 -0700
[email protected]@ -9,7 +9,7 @@ from ..exceptions import (
      ReadTimeoutError,
      ResponseError,
  )
 -from ..packages import six
 +import six
-
-
+ 
+ 
  log = logging.getLogger(__name__)
--- a/components/python/urllib3/urllib3-PYVER.p5m	Wed Sep 07 14:48:40 2016 -0700
+++ b/components/python/urllib3/urllib3-PYVER.p5m	Wed Sep 07 14:48:40 2016 -0700
@@ -29,7 +29,7 @@
 set name=pkg.summary \
     value="HTTP library with thread-safe connection pooling, file post, and more."
 set name=pkg.description \
-    value="An HTTP library with thread-safe connection pooling, file post, and more."
+    value="urllib3 is a powerful, sanity-friendly HTTP client for Python. It brings many critical features that are missing from the Python standard libraries including: 1) Thread safety; 2) Connection pooling; 3) Client-side SSL/TLS verification; 4) File uploads with multipart encoding; 5) Helpers for retrying requests and dealing with HTTP redirects; 6) Support for gzip and deflate encoding; 7) Proxy support for HTTP and SOCKS."
 set name=com.oracle.info.description value="the Python urllib3 module"
 set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
@@ -43,18 +43,26 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
+file path=usr/lib/python$(PYVER)/vendor-packages/urllib3-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
+file path=usr/lib/python$(PYVER)/vendor-packages/urllib3-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/_collections.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/connection.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/connectionpool.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/contrib/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/contrib/appengine.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/contrib/ntlmpool.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/contrib/pyopenssl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/contrib/socks.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/fields.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/filepost.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/packages/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/packages/backports/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/packages/backports/makefile.py
+file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/packages/ordered_dict.py
+file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/packages/six.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/packages/ssl_match_hostname/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/packages/ssl_match_hostname/_implementation.py
 file path=usr/lib/python$(PYVER)/vendor-packages/urllib3/poolmanager.py
--- a/components/python/urllib3/urllib3.license	Wed Sep 07 14:48:40 2016 -0700
+++ b/components/python/urllib3/urllib3.license	Wed Sep 07 14:48:40 2016 -0700
@@ -1,5 +1,8 @@
+LICENSE.txt:
 
-Copyright 2008-2014 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
+This is the MIT license: http://www.opensource.org/licenses/mit-license.php
+
+Copyright 2008-2016 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this
 software and associated documentation files (the "Software"), to deal in the Software
@@ -21,7 +24,7 @@
 dummyserver/proxy.py
 
 #
-# Copyright (C) 2012 Senko Rasic 
+# Copyright (C) 2012 Senko Rasic <[email protected]>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -73,7 +76,7 @@
 
 The MIT License (MIT)
 
-Copyright (c) 
+Copyright (c) <year> <copyright holders>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -97,7 +100,7 @@
 urllib3/packages/ssl_match_hostname/_implementation.py
 
 ========================================
-PSF LICENSE AGREEMENT FOR PYTHON 3.3.3
+ PSF LICENSE AGREEMENT FOR PYTHON 3.3.3
 ========================================
 
 1.  This LICENSE AGREEMENT is between the Python Software Foundation (“PSF”),
@@ -135,4 +138,3 @@
     products or services of Licensee, or any third party.
 8.  By copying, installing or otherwise using Python 3.3.3, Licensee agrees to
     be bound by the terms and conditions of this License Agreement.
-