23079603 Update pip to 8.1.1
authorDrew Fisher <drew.fisher@oracle.com>
Tue, 21 Jun 2016 09:35:00 -0700
changeset 6262 879221d37327
parent 6261 1dda1578278c
child 6263 1cfbcff418a3
23079603 Update pip to 8.1.1
components/python/pip/Makefile
components/python/pip/patches/01-unbundle-requests.patch
components/python/pip/pip-PYVER.p5m
components/python/pip/pip.license
--- a/components/python/pip/Makefile	Tue Jun 21 09:11:29 2016 -0700
+++ b/components/python/pip/Makefile	Tue Jun 21 09:35:00 2016 -0700
@@ -24,16 +24,16 @@
 include ../../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=         pip
-COMPONENT_VERSION=      6.0.8
+COMPONENT_VERSION=      8.1.1
 COMPONENT_SRC=          $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=      $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:0d58487a1b7f5be2e5e965c11afbea1dc44ecec8069de03491a4d0d6c85f4551
+    sha256:3e78d3066aaeb633d185a57afdccf700aa2e660436b4af618bcb6ff0fa511798
 COMPONENT_ARCHIVE_URL=  $(call pypi_url)
 COMPONENT_PROJECT_URL=  https://github.com/pypa/pip
 COMPONENT_BUGDB=	utility/pip
 
-TPNO=			21944
+TPNO=			27739
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/setup.py.mk
--- a/components/python/pip/patches/01-unbundle-requests.patch	Tue Jun 21 09:11:29 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-In-house patch to 'unbundle' requests v2.5.1 (which has a known CVE) to
-instead use requests v2.6.0 which is already available in Solaris.
-
---- pip-6.0.8/pip/__init__.py.orig	2015-06-03 20:10:13.002501253 -0700
-+++ pip-6.0.8/pip/__init__.py	2015-06-03 20:10:57.018903229 -0700
[email protected]@ -16,9 +16,7 @@ from pip.vcs import git, mercurial, subv
- from pip.baseparser import ConfigOptionParser, UpdatingDefaultsHelpFormatter
- from pip.commands import get_summaries, get_similar_commands
- from pip.commands import commands_dict
--from pip._vendor.requests.packages.urllib3.exceptions import (
--    InsecureRequestWarning,
--)
-+from requests.packages.urllib3.exceptions import InsecureRequestWarning
- 
- 
- # assignment for flake8 to be happy
-
---- pip-6.0.8/pip/_vendor/cachecontrol/adapter.py.orig    2015-06-03 20:13:32.884043045 -0700
-+++ pip-6.0.8/pip/_vendor/cachecontrol/adapter.py  2015-06-03 20:13:51.401124573 -0700
[email protected]@ -1,6 +1,6 @@
- import functools
-
--from pip._vendor.requests.adapters import HTTPAdapter
-+from requests.adapters import HTTPAdapter
-
- from .controller import CacheController
- from .cache import DictCache
-
---- pip-6.0.8/pip/_vendor/cachecontrol/compat.py.orig       2015-06-03 20:14:32.456221635 -0700
-+++ pip-6.0.8/pip/_vendor/cachecontrol/compat.py   2015-06-03 20:15:13.070994049 -0700
[email protected]@ -12,5 +12,5 @@ except ImportError:
-
- # Handle the case where the requests has been patched to not have urllib3
- # bundled as part of it's source.
--from pip._vendor.requests.packages.urllib3.response import HTTPResponse
--from pip._vendor.requests.packages.urllib3.util import is_fp_closed
-+from requests.packages.urllib3.response import HTTPResponse
-+from requests.packages.urllib3.util import is_fp_closed
-
---- pip-6.0.8/pip/_vendor/cachecontrol/controller.py.orig   2015-06-03 20:15:52.523400877 -0700
-+++ pip-6.0.8/pip/_vendor/cachecontrol/controller.py       2015-06-03 20:16:13.267223970 -0700
[email protected]@ -6,7 +6,7 @@ import calendar
- import time
- from email.utils import parsedate_tz
-
--from pip._vendor.requests.structures import CaseInsensitiveDict
-+from requests.structures import CaseInsensitiveDict
-
- from .cache import DictCache
- from .serialize import Serializer
-
---- pip-6.0.8/pip/_vendor/cachecontrol/serialize.py.orig      2015-06-03 20:17:00.074044178 -0700
-+++ pip-6.0.8/pip/_vendor/cachecontrol/serialize.py        2015-06-03 20:17:09.414723163 -0700
[email protected]@ -3,7 +3,7 @@ import io
- import json
- import zlib
-
--from pip._vendor.requests.structures import CaseInsensitiveDict
-+from requests.structures import CaseInsensitiveDict
-
- from .compat import HTTPResponse, pickle
-
---- pip-6.0.8/pip/download.py.orig 2015-06-03 20:19:11.208085248 -0700
-+++ pip-6.0.8/pip/download.py 2015-06-03 20:21:09.714266385 -0700
[email protected]@ -27,17 +27,19 @@ from pip.utils.filesystem import check_p
- from pip.utils.ui import DownloadProgressBar, DownloadProgressSpinner
- from pip.locations import write_delete_marker_file
- from pip.vcs import vcs
--from pip._vendor import requests, six
--from pip._vendor.requests.adapters import BaseAdapter, HTTPAdapter
--from pip._vendor.requests.auth import AuthBase, HTTPBasicAuth
--from pip._vendor.requests.models import Response
--from pip._vendor.requests.structures import CaseInsensitiveDict
--from pip._vendor.requests.packages import urllib3
-+from pip._vendor import six
- from pip._vendor.cachecontrol import CacheControlAdapter
- from pip._vendor.cachecontrol.caches import FileCache
- from pip._vendor.lockfile import LockError
- from pip._vendor.six.moves import xmlrpc_client
-
-+import requests
-+from requests.adapters import BaseAdapter, HTTPAdapter
-+from requests.auth import AuthBase, HTTPBasicAuth
-+from requests.models import Response
-+from requests.structures import CaseInsensitiveDict
-+from requests.packages import urllib3
-+
-
- __all__ = ['get_file_content',
-            'is_url', 'url_to_path', 'path_to_url',
-
---- pip-6.0.8/pip/index.py.orig  2015-06-03 20:21:43.458489848 -0700
-+++ pip-6.0.8/pip/index.py    2015-06-03 20:22:16.929267163 -0700
[email protected]@ -26,9 +26,10 @@ from pip.models import PyPI
- from pip.wheel import Wheel, wheel_ext
- from pip.pep425tags import supported_tags, supported_tags_noarch, get_platform
- from pip.req.req_requirement import InstallationCandidate
--from pip._vendor import html5lib, requests, pkg_resources, six
-+from pip._vendor import html5lib, pkg_resources, six
- from pip._vendor.packaging.version import parse as parse_version
--from pip._vendor.requests.exceptions import SSLError
-+import requests
-+from requests.exceptions import SSLError
-
-
- __all__ = ['PackageFinder']
-
---- pip-6.0.8/pip/req/req_set.py.orig    2015-06-03 20:23:31.735567930 -0700
-+++ pip-6.0.8/pip/req/req_set.py  2015-06-03 20:23:55.732059685 -0700
[email protected]@ -4,7 +4,6 @@ import logging
- import os
-
- from pip._vendor import pkg_resources
--from pip._vendor import requests
-
- from pip.download import (url_to_path, unpack_url)
- from pip.exceptions import (InstallationError, BestVersionAlreadyInstalled,
[email protected]@ -16,6 +15,7 @@ from pip.utils import (display_path, rmt
- from pip.utils.logging import indent_log
- from pip.vcs import vcs
- from pip.wheel import wheel_ext
-+import requests
-
-
- logger = logging.getLogger(__name__)
--- a/components/python/pip/pip-PYVER.p5m	Tue Jun 21 09:11:29 2016 -0700
+++ b/components/python/pip/pip-PYVER.p5m	Tue Jun 21 09:35:00 2016 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -46,7 +46,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pip-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pip-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pip-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
-file path=usr/lib/python$(PYVER)/vendor-packages/pip-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/pip-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pip-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/__init__.py
@@ -55,6 +54,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/_markerlib/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/_markerlib/markers.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/_cmd.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/adapter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/cache.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/caches/__init__.py
@@ -66,10 +66,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/heuristics.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/serialize.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/cachecontrol/wrapper.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/certifi/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/certifi/__main__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/certifi/cacert.pem
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/certifi/core.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/colorama/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/colorama/ansi.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/colorama/ansitowin32.py
@@ -146,7 +142,10 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/_compat.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/_structures.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/markers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/requirements.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/specifiers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/packaging/version.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/pkg_resources/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/progress/__init__.py
@@ -154,7 +153,93 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/progress/counter.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/progress/helpers.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/progress/spinner.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/pyparsing.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/re-vendor.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/adapters.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/api.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/auth.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/cacert.pem
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/certs.py \
+    pkg.depend.bypass-generate=.*/certifi.*
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/cookies.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/hooks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/models.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/big5freq.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/big5prober.py
+file \
+    path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/chardetect.py \
+    pkg.depend.bypass-generate=.*/chardet.* \
+    pkg.depend.bypass-generate=.*/universaldetector.*
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/chardistribution.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/charsetgroupprober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/charsetprober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/codingstatemachine.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/compat.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/constants.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/cp949prober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/escprober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/escsm.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/eucjpprober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/euckrfreq.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/euckrprober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/euctwfreq.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/euctwprober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/gb2312freq.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/gb2312prober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/hebrewprober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/jisfreq.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/jpcntx.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/langbulgarianmodel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/langcyrillicmodel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/langgreekmodel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/langhebrewmodel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/langhungarianmodel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/langthaimodel.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/latin1prober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/mbcharsetprober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/mbcsgroupprober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/mbcssm.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/sbcharsetprober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/sbcsgroupprober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/sjisprober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/universaldetector.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/chardet/utf8prober.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/_collections.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/connection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/connectionpool.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/contrib/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/contrib/appengine.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/contrib/ntlmpool.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/contrib/pyopenssl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/fields.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/filepost.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/packages/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/packages/ordered_dict.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/packages/six.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/packages/ssl_match_hostname/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/packages/ssl_match_hostname/_implementation.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/poolmanager.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/request.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/response.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/util/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/util/connection.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/util/request.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/util/response.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/util/retry.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/util/ssl_.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/util/timeout.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/packages/urllib3/util/url.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/sessions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/status_codes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/structures.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/requests/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/retrying.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/_vendor/six.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/basecommand.py
@@ -162,18 +247,19 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/cmdoptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/completion.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/download.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/freeze.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/hash.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/help.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/install.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/list.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/search.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/show.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/uninstall.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/unzip.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/wheel.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/commands/zip.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/compat/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/compat/dictconfig.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/compat/ordereddict.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/download.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/index.py
@@ -186,7 +272,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/req/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/req/req_file.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/req/req_install.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pip/req/req_requirement.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/req/req_set.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/req/req_uninstall.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/status_codes.py
@@ -194,9 +279,12 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/appdirs.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/build.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/deprecation.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/encoding.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/filesystem.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/hashes.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/logging.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/outdated.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/setuptools_build.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/utils/ui.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/vcs/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/vcs/bazaar.py
@@ -204,6 +292,7 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/vcs/mercurial.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/vcs/subversion.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pip/wheel.py
+#
 license LICENSE.txt license=MIT
 
 # force a group dependency on the optional simplejson; pkgdepend work is needed
--- a/components/python/pip/pip.license	Tue Jun 21 09:11:29 2016 -0700
+++ b/components/python/pip/pip.license	Tue Jun 21 09:35:00 2016 -0700
@@ -1,55 +1,48 @@
-===============================================================================
-CacheControl-0.11.1
 ===============================================================================
-The MIT License (MIT)
-
-Copyright (c) 2015 Eric Larson 
+pip-8.1.1
+===============================================================================
+Copyright (c) 2008-2016 The pip developers (see AUTHORS.txt file)
 
-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 without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+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 without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ===============================================================================
-certifi-14.05.14
+CacheControl-0.11.6
 ===============================================================================
-This packge contains a modified version of ca-bundle.crt:
+Copyright 2015 Eric Larson
 
-ca-bundle.crt -- Bundle of CA Root Certificates
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-Certificate data from Mozilla as of: Thu Nov 3 19:04:19 2011#
-This is a bundle of X.509 certificates of public Certificate Authorities
-(CA). These were automatically extracted from Mozilla's root certificates
-file (certdata.txt). This file can be found in the mozilla source tree:
-http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1#
-It contains the certificates in PEM format and therefore
-can be directly used with curl / libcurl / php_curl, or with
-an Apache+mod_ssl webserver for SSL client authentication.
-Just configure this file as the SSLCACertificateFile.#
+    http://www.apache.org/licenses/LICENSE-2.0
 
-***** BEGIN LICENSE BLOCK *****
-This Source Code Form is subject to the terms of the Mozilla Public License,
-v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain
-one at http://mozilla.org/MPL/2.0/.
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+    implied.
 
-***** END LICENSE BLOCK *****
[email protected](#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $
+    See the License for the specific language governing permissions and
+    limitations under the License.
 
 ===============================================================================
-colorama-0.3.3
+colorama-0.3.6
 ===============================================================================
 Copyright (c) 2010 Jonathan Hartley
 All rights reserved.
@@ -58,15 +51,15 @@
 modification, are permitted provided that the following conditions are met:
 
 * Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
+  list of conditions and the following disclaimer.
 
 * Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
 * Neither the name of the copyright holders, nor those of its contributors
-may be used to endorse or promote products derived from this software without
-specific prior written permission.
+  may be used to endorse or promote products derived from this software without
+  specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -80,7 +73,7 @@
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===============================================================================
-distlib-0.2.0
+distlib-0.2.2
 ===============================================================================
 
 PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -91,49 +84,50 @@
 otherwise using this software ("Python") in source or binary form and
 its associated documentation.
 
-2. Subject to the terms and conditions of this License Agreement, PSF
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python alone
-or in any derivative version, provided, however, that PSF's License
-Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software
-Foundation; All Rights Reserved" are retained in Python alone or in
-any derivative version prepared by Licensee.
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Python Software Foundation; All Rights Reserved" are retained in Python alone or
+in any derivative version prepared by Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make the
-derivative work available to others as provided herein, then Licensee
-hereby agrees to include in any such work a brief summary of the
-changes made to Python.
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
 
-4. PSF is making Python available to Licensee on an "AS IS" basis.
-PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY
-WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY
-REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY
-THIRD PARTY RIGHTS.
+4. PSF is making Python available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
-RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY
-DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material
 breach of its terms and conditions.
 
 7. Nothing in this License Agreement shall be deemed to create any
 relationship of agency, partnership, or joint venture between PSF and
-Licensee. This License Agreement does not grant permission to use PSF
+Licensee.  This License Agreement does not grant permission to use PSF
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using Python, Licensee agrees
-to be bound by the terms and conditions of this License Agreement.
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
 
 ===============================================================================
-html5lib-0.999
+html5lib-v1.0b8
 ===============================================================================
+
 Copyright (c) 2006-2013 James Graham and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -156,10 +150,8 @@
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ===============================================================================
-ipaddress-1.0.7
+ipaddress-1.0.16
 ===============================================================================
-This package is a modified version of cpython's ipaddress module.
-It is therefore distributed under the PSF license, as follows: 
 
 PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 --------------------------------------------
@@ -174,9 +166,9 @@
 analyze, test, perform and/or display publicly, prepare derivative works,
 distribute, and otherwise use Python alone or in any derivative version,
 provided, however, that PSF's License Agreement and PSF's notice of copyright,
-i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-2011, 2012, 2013, 2014 Python Software Foundation; All Rights Reserved" are
-retained in Python alone or in any derivative version prepared by Licensee.
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Python Software Foundation; All Rights Reserved" are retained in Python alone or
+in any derivative version prepared by Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
 or incorporates Python or any part thereof, and wants to make
@@ -185,8 +177,8 @@
 the changes made to Python.
 
 4. PSF is making Python available to Licensee on an "AS IS"
-basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
 FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
 INFRINGE ANY THIRD PARTY RIGHTS.
@@ -201,7 +193,7 @@
 
 7. Nothing in this License Agreement shall be deemed to create any
 relationship of agency, partnership, or joint venture between PSF and
-Licensee. This License Agreement does not grant permission to use PSF
+Licensee.  This License Agreement does not grant permission to use PSF
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
@@ -235,189 +227,221 @@
 IN THE SOFTWARE.
 
 ===============================================================================
-packaging-15.0
+packaging-16.5
 ===============================================================================
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
+This software is made available under the terms of *either* of the licenses
+found in LICENSE.APACHE or LICENSE.BSD. Contributions to this software is made
+under the terms of *both* these licenses.
 
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-1. Definitions.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
+   1. Definitions.
 
-"Licensor" shall mean the copyright owner or entity authorized by
-the copyright owner that is granting the License.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-"Legal Entity" shall mean the union of the acting entity and all
-other entities that control, are controlled by, or are under common
-control with that entity. For the purposes of this definition,
-"control" means (i) the power, direct or indirect, to cause the
-direction or management of such entity, whether by contract or
-otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-"You" (or "Your") shall mean an individual or Legal Entity
-exercising permissions granted by this License.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation
-source, and configuration files.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
-"Object" form shall mean any form resulting from mechanical
-transformation or translation of a Source form, including but
-not limited to compiled object code, generated documentation,
-and conversions to other media types.
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
-"Work" shall mean the work of authorship, whether in Source or
-Object form, made available under the License, as indicated by a
-copyright notice that is included in or attached to the work
-(an example is provided in the Appendix below).
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-"Derivative Works" shall mean any work, whether in Source or Object
-form, that is based on (or derived from) the Work and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship. For the purposes
-of this License, Derivative Works shall not include works that remain
-separable from, or merely link (or bind by name) to the interfaces of,
-the Work and Derivative Works thereof.
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
 
-"Contribution" shall mean any work of authorship, including
-the original version of the Work and any modifications or additions
-to that Work or Derivative Works thereof, that is intentionally
-submitted to Licensor for inclusion in the Work by the copyright owner
-or by an individual or Legal Entity authorized to submit on behalf of
-the copyright owner. For the purposes of this definition, "submitted"
-means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems,
-and issue tracking systems that are managed by, or on behalf of, the
-Licensor for the purpose of discussing and improving the Work, but
-excluding communication that is conspicuously marked or otherwise
-designated in writing by the copyright owner as "Not a Contribution."
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-"Contributor" shall mean Licensor and any individual or Legal Entity
-on behalf of whom a Contribution has been received by Licensor and
-subsequently incorporated within the Work.
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
 
-2. Grant of Copyright License. Subject to the terms and conditions of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the
-Work and such Derivative Works in Source or Object form.
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
 
-3. Grant of Patent License. Subject to the terms and conditions of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have made,
-use, offer to sell, sell, import, and otherwise transfer the Work,
-where such license applies only to those patent claims licensable
-by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s)
-with the Work to which such Contribution(s) was submitted. If You
-institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work
-or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate
-as of the date such litigation is filed.
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
 
-4. Redistribution. You may reproduce and distribute copies of the
-Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You
-meet the following conditions:
-
-(a) You must give any other recipients of the Work or
-Derivative Works a copy of this License; and
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
 
-(b) You must cause any modified files to carry prominent notices
-stating that You changed the files; and
-
-(c) You must retain, in the Source form of any Derivative Works
-that You distribute, all copyright, patent, trademark, and
-attribution notices from the Source form of the Work,
-excluding those notices that do not pertain to any part of
-the Derivative Works; and
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
 
-(d) If the Work includes a "NOTICE" text file as part of its
-distribution, then any Derivative Works that You distribute must
-include a readable copy of the attribution notices contained
-within such NOTICE file, excluding those notices that do not
-pertain to any part of the Derivative Works, in at least one
-of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or
-documentation, if provided along with the Derivative Works; or,
-within a display generated by the Derivative Works, if and
-wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and
-do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside
-or as an addendum to the NOTICE text from the Work, provided
-that such additional attribution notices cannot be construed
-as modifying the License.
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
 
-You may add Your own copyright statement to Your modifications and
-may provide additional or different license terms and conditions
-for use, reproduction, or distribution of Your modifications, or
-for any such Derivative Works as a whole, provided Your use,
-reproduction, and distribution of the Work otherwise complies with
-the conditions stated in this License.
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
 
-5. Submission of Contributions. Unless You explicitly state otherwise,
-any Contribution intentionally submitted for inclusion in the Work
-by You to the Licensor shall be under the terms and conditions of
-this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify
-the terms of any separate license agreement you may have executed
-with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-names, trademarks, service marks, or product names of the Licensor,
-except as required for reasonable and customary use in describing the
-origin of the Work and reproducing the content of the NOTICE file.
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
 
-7. Disclaimer of Warranty. Unless required by applicable law or
-agreed to in writing, Licensor provides the Work (and each
-Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied, including, without limitation, any warranties or conditions
-of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining the
-appropriateness of using or redistributing the Work and assume any
-risks associated with Your exercise of permissions under this License.
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+-------
+
+Copyright (c) Donald Stufft and individual contributors.
+All rights reserved.
 
-8. Limitation of Liability. In no event and under no legal theory,
-whether in tort (including negligence), contract, or otherwise,
-unless required by applicable law (such as deliberate and grossly
-negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising as a
-result of this License or out of the use or inability to use the
-Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all
-other commercial damages or losses), even if such Contributor
-has been advised of the possibility of such damages.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
 
-9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer,
-and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with this
-License. However, in accepting such obligations, You may act only
-on Your own behalf and on Your sole responsibility, not on behalf
-of any other Contributor, and only if You agree to indemnify,
-defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason
-of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS%
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===============================================================================
 progress-1.2
 ===============================================================================
-# Copyright (c) 2012 Giorgos Verigakis 
+
+# Copyright (c) 2012 Giorgos Verigakis <[email protected]>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -432,231 +456,233 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ===============================================================================
-requests-2.5.1
+requests-2.9.1
 ===============================================================================
-Copyright 2014 Kenneth Reitz
+Copyright 2016 Kenneth Reitz
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
 ===============================================================================
 retrying-1.3.3
 ===============================================================================
-Apache License
-Version 2.0, January 2004
-http://www.apache.org/licenses/
+
 
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-1. Definitions.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
+   1. Definitions.
 
-"Licensor" shall mean the copyright owner or entity authorized by
-the copyright owner that is granting the License.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
 
-"Legal Entity" shall mean the union of the acting entity and all
-other entities that control, are controlled by, or are under common
-control with that entity. For the purposes of this definition,
-"control" means (i) the power, direct or indirect, to cause the
-direction or management of such entity, whether by contract or
-otherwise, or (ii) ownership of fifty percent (50%) or more of the
-outstanding shares, or (iii) beneficial ownership of such entity.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
 
-"You" (or "Your") shall mean an individual or Legal Entity
-exercising permissions granted by this License.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
 
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation
-source, and configuration files.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
 
-"Object" form shall mean any form resulting from mechanical
-transformation or translation of a Source form, including but
-not limited to compiled object code, generated documentation,
-and conversions to other media types.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
 
-"Work" shall mean the work of authorship, whether in Source or
-Object form, made available under the License, as indicated by a
-copyright notice that is included in or attached to the work
-(an example is provided in the Appendix below).
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
 
-"Derivative Works" shall mean any work, whether in Source or Object
-form, that is based on (or derived from) the Work and for which the
-editorial revisions, annotations, elaborations, or other modifications
-represent, as a whole, an original work of authorship. For the purposes
-of this License, Derivative Works shall not include works that remain
-separable from, or merely link (or bind by name) to the interfaces of,
-the Work and Derivative Works thereof.
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
 
-"Contribution" shall mean any work of authorship, including
-the original version of the Work and any modifications or additions
-to that Work or Derivative Works thereof, that is intentionally
-submitted to Licensor for inclusion in the Work by the copyright owner
-or by an individual or Legal Entity authorized to submit on behalf of
-the copyright owner. For the purposes of this definition, "submitted"
-means any form of electronic, verbal, or written communication sent
-to the Licensor or its representatives, including but not limited to
-communication on electronic mailing lists, source code control systems,
-and issue tracking systems that are managed by, or on behalf of, the
-Licensor for the purpose of discussing and improving the Work, but
-excluding communication that is conspicuously marked or otherwise
-designated in writing by the copyright owner as "Not a Contribution."
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
 
-"Contributor" shall mean Licensor and any individual or Legal Entity
-on behalf of whom a Contribution has been received by Licensor and
-subsequently incorporated within the Work.
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
 
-2. Grant of Copyright License. Subject to the terms and conditions of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-copyright license to reproduce, prepare Derivative Works of,
-publicly display, publicly perform, sublicense, and distribute the
-Work and such Derivative Works in Source or Object form.
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
 
-3. Grant of Patent License. Subject to the terms and conditions of
-this License, each Contributor hereby grants to You a perpetual,
-worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-(except as stated in this section) patent license to make, have made,
-use, offer to sell, sell, import, and otherwise transfer the Work,
-where such license applies only to those patent claims licensable
-by such Contributor that are necessarily infringed by their
-Contribution(s) alone or by combination of their Contribution(s)
-with the Work to which such Contribution(s) was submitted. If You
-institute patent litigation against any entity (including a
-cross-claim or counterclaim in a lawsuit) alleging that the Work
-or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses
-granted to You under this License for that Work shall terminate
-as of the date such litigation is filed.
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
 
-4. Redistribution. You may reproduce and distribute copies of the
-Work or Derivative Works thereof in any medium, with or without
-modifications, and in Source or Object form, provided that You
-meet the following conditions:
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
 
-(a) You must give any other recipients of the Work or
-Derivative Works a copy of this License; and
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
 
-(b) You must cause any modified files to carry prominent notices
-stating that You changed the files; and
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
 
-(c) You must retain, in the Source form of any Derivative Works
-that You distribute, all copyright, patent, trademark, and
-attribution notices from the Source form of the Work,
-excluding those notices that do not pertain to any part of
-the Derivative Works; and
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
 
-(d) If the Work includes a "NOTICE" text file as part of its
-distribution, then any Derivative Works that You distribute must
-include a readable copy of the attribution notices contained
-within such NOTICE file, excluding those notices that do not
-pertain to any part of the Derivative Works, in at least one
-of the following places: within a NOTICE text file distributed
-as part of the Derivative Works; within the Source form or
-documentation, if provided along with the Derivative Works; or,
-within a display generated by the Derivative Works, if and
-wherever such third-party notices normally appear. The contents
-of the NOTICE file are for informational purposes only and
-do not modify the License. You may add Your own attribution
-notices within Derivative Works that You distribute, alongside
-or as an addendum to the NOTICE text from the Work, provided
-that such additional attribution notices cannot be construed
-as modifying the License.
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
 
-You may add Your own copyright statement to Your modifications and
-may provide additional or different license terms and conditions
-for use, reproduction, or distribution of Your modifications, or
-for any such Derivative Works as a whole, provided Your use,
-reproduction, and distribution of the Work otherwise complies with
-the conditions stated in this License.
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
 
-5. Submission of Contributions. Unless You explicitly state otherwise,
-any Contribution intentionally submitted for inclusion in the Work
-by You to the Licensor shall be under the terms and conditions of
-this License, without any additional terms or conditions.
-Notwithstanding the above, nothing herein shall supersede or modify
-the terms of any separate license agreement you may have executed
-with Licensor regarding such Contributions.
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
 
-6. Trademarks. This License does not grant permission to use the trade
-names, trademarks, service marks, or product names of the Licensor,
-except as required for reasonable and customary use in describing the
-origin of the Work and reproducing the content of the NOTICE file.
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
 
-7. Disclaimer of Warranty. Unless required by applicable law or
-agreed to in writing, Licensor provides the Work (and each
-Contributor provides its Contributions) on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied, including, without limitation, any warranties or conditions
-of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-PARTICULAR PURPOSE. You are solely responsible for determining the
-appropriateness of using or redistributing the Work and assume any
-risks associated with Your exercise of permissions under this License.
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
 
-8. Limitation of Liability. In no event and under no legal theory,
-whether in tort (including negligence), contract, or otherwise,
-unless required by applicable law (such as deliberate and grossly
-negligent acts) or agreed to in writing, shall any Contributor be
-liable to You for damages, including any direct, indirect, special,
-incidental, or consequential damages of any character arising as a
-result of this License or out of the use or inability to use the
-Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all
-other commercial damages or losses), even if such Contributor
-has been advised of the possibility of such damages.
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
 
-9. Accepting Warranty or Additional Liability. While redistributing
-the Work or Derivative Works thereof, You may choose to offer,
-and charge a fee for, acceptance of support, warranty, indemnity,
-or other liability obligations and/or rights consistent with this
-License. However, in accepting such obligations, You may act only
-on Your own behalf and on Your sole responsibility, not on behalf
-of any other Contributor, and only if You agree to indemnify,
-defend, and hold each Contributor harmless for any liability
-incurred by, or claims asserted against, such Contributor by reason
-of your accepting any such warranty or additional liability.
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
 
-END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS
 
-APPENDIX: How to apply the Apache License to your work.
+   APPENDIX: How to apply the Apache License to your work.
 
-To apply the Apache License to your work, attach the following
-boilerplate notice, with the fields enclosed by brackets "[]"
-replaced with your own identifying information. (Don't include
-the brackets!) The text should be enclosed in the appropriate
-comment syntax for the file format. We also recommend that a
-file or class name and description of purpose be included on the
-same "printed page" as the copyright notice for easier
-identification within third-party archives.
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
 
-Copyright [yyyy] [name of copyright owner]
+   Copyright [yyyy] [name of copyright owner]
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-http://www.apache.org/licenses/LICENSE-2.0
+       http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.%
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 
 ===============================================================================
-six-1.9.0
+six-1.10.0
 ===============================================================================
-Copyright (c) 2010-2015 Benjamin Peterson
+Copyright (c) 2010-2016 Benjamin Peterson
 
 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
@@ -678,156 +704,156 @@
 ===============================================================================
 chardet 2.3.0
 ===============================================================================
-		 GNU LESSER GENERAL PUBLIC LICENSE
-		 Version 2.1, February 1999
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
 
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-[This is the first released version of the Lesser GPL. It also counts
-as the successor of the GNU Library Public License, version 2, hence
-the version number 2.1.]
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
 
-			 Preamble
+			    Preamble
 
-The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
 Licenses are intended to guarantee your freedom to share and change
 free software--to make sure the software is free for all its users.
 
-This license, the Lesser General Public License, applies to some
+  This license, the Lesser General Public License, applies to some
 specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
+Free Software Foundation and other authors who decide to use it.  You
 can use it too, but we suggest you first think carefully about whether
 this license or the ordinary General Public License is the better
 strategy to use in any particular case, based on the explanations below.
 
-When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
 you have the freedom to distribute copies of free software (and charge
 for this service if you wish); that you receive source code or can get
 it if you want it; that you can change the software and use pieces of
 it in new free programs; and that you are informed that you can do
 these things.
 
-To protect your rights, we need to make restrictions that forbid
+  To protect your rights, we need to make restrictions that forbid
 distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
+rights.  These restrictions translate to certain responsibilities for
 you if you distribute copies of the library or if you modify it.
 
-For example, if you distribute copies of the library, whether gratis
+  For example, if you distribute copies of the library, whether gratis
 or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
 complete object files to the recipients, so that they can relink them
 with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
+it.  And you must show them these terms so they know their rights.
 
-We protect your rights with a two-step method: (1) we copyright the
+  We protect your rights with a two-step method: (1) we copyright the
 library, and (2) we offer you this license, which gives you legal
 permission to copy, distribute and/or modify the library.
 
-To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
 modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
-Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
+restrictive license from a patent holder.  Therefore, we insist that
 any patent license obtained for a version of the library must be
 consistent with the full freedom of use specified in this license.
 
-Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
 General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
+is quite different from the ordinary General Public License.  We use
 this license for certain libraries in order to permit linking those
 libraries into non-free programs.
 
-When a program is linked with a library, whether statically or using
+  When a program is linked with a library, whether statically or using
 a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
+combined work, a derivative of the original library.  The ordinary
 General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
+entire combination fits its criteria of freedom.  The Lesser General
 Public License permits more lax criteria for linking other code with
 the library.
 
-We call this license the "Lesser" General Public License because it
+  We call this license the "Lesser" General Public License because it
 does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
 are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
+libraries.  However, the Lesser license provides advantages in certain
 special circumstances.
 
-For example, on rare occasions, there may be a special need to
+  For example, on rare occasions, there may be a special need to
 encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
 case, there is little to gain by limiting the free library to free
 software only, so we use the Lesser General Public License.
 
-In other cases, permission to use a particular library in non-free
+  In other cases, permission to use a particular library in non-free
 programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
+free software.  For example, permission to use the GNU C Library in
 non-free programs enables many more people to use the whole GNU
 operating system, as well as its variant, the GNU/Linux operating
 system.
 
-Although the Lesser General Public License is Less protective of the
+  Although the Lesser General Public License is Less protective of the
 users' freedom, it does ensure that the user of a program that is
 linked with the Library has the freedom and the wherewithal to run
 that program using a modified version of the Library.
 
-The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-		 GNU LESSER GENERAL PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License Agreement applies to any software library or other
+  0. This License Agreement applies to any software library or other
 program which contains a notice placed by the copyright holder or
 other authorized party saying it may be distributed under the terms of
 this Lesser General Public License (also called "this License").
 Each licensee is addressed as "you".
 
-A "library" means a collection of software functions and/or data
+  A "library" means a collection of software functions and/or data
 prepared so as to be conveniently linked with application programs
 (which use some of those functions and data) to form executables.
 
-The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
 Library" means either the Library or any derivative work under
 copyright law: that is to say, a work containing the Library or a
 portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
+straightforwardly into another language.  (Hereinafter, translation is
 included without limitation in the term "modification".)
 
-"Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
 all the source code for all modules it contains, plus any associated
 interface definition files, plus the scripts used to control compilation
 and installation of the library.
 
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
 running a program using the Library is not restricted, and output from
 such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
+writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-
-1. You may copy and distribute verbatim copies of the Library's
+  
+  1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
 appropriate copyright notice and disclaimer of warranty; keep intact
@@ -835,43 +861,43 @@
 warranty; and distribute a copy of this License along with the
 Library.
 
-You may charge a fee for the physical act of transferring a copy,
+  You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
-2. You may modify your copy or copies of the Library or any portion
+
+  2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
 above, provided that you also meet all of these conditions:
 
-a) The modified work must itself be a software library.
+    a) The modified work must itself be a software library.
 
-b) You must cause the files modified to carry prominent notices
-stating that you changed the files and the date of any change.
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
 
-c) You must cause the whole of the work to be licensed at no
-charge to all third parties under the terms of this License.
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
 
-d) If a facility in the modified Library refers to a function or a
-table of data to be supplied by an application program that uses
-the facility, other than as an argument passed when the facility
-is invoked, then you must make a good faith effort to ensure that,
-in the event an application does not supply such function or
-table, the facility still operates, and performs whatever part of
-its purpose remains meaningful.
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
 
-(For example, a function in a library to compute square roots has
-a purpose that is entirely well-defined independent of the
-application. Therefore, Subsection 2d requires that any
-application-supplied function or table used by this function must
-be optional: if the application does not supply it, the square
-root function must still compute square roots.)
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
 
-These requirements apply to the modified work as a whole. If
+These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Library,
 and can be reasonably considered independent and separate works in
 themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
+sections when you distribute them as separate works.  But when you
 distribute the same sections as part of a whole which is a work based
 on the Library, the distribution of the whole must be on the terms of
 this License, whose permissions for other licensees extend to the
@@ -888,177 +914,177 @@
 a storage or distribution medium does not bring the other work under
 the scope of this License.
 
-3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
 this, you must alter all the notices that refer to this License, so
 that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
+instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
+that version instead if you wish.)  Do not make any other change in
 these notices.
-
-Once this change is made in a given copy, it is irreversible for
+
+  Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
 
-This option is useful when you wish to copy part of the code of
+  This option is useful when you wish to copy part of the code of
 the Library into a program that is not a library.
 
-4. You may copy and distribute the Library (or a portion or
+  4. You may copy and distribute the Library (or a portion or
 derivative of it, under Section 2) in object code or executable form
 under the terms of Sections 1 and 2 above provided that you accompany
 it with the complete corresponding machine-readable source code, which
 must be distributed under the terms of Sections 1 and 2 above on a
 medium customarily used for software interchange.
 
-If distribution of object code is made by offering access to copy
+  If distribution of object code is made by offering access to copy
 from a designated place, then offering equivalent access to copy the
 source code from the same place satisfies the requirement to
 distribute the source code, even though third parties are not
 compelled to copy the source along with the object code.
 
-5. A program that contains no derivative of any portion of the
+  5. A program that contains no derivative of any portion of the
 Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
+linked with it, is called a "work that uses the Library".  Such a
 work, in isolation, is not a derivative work of the Library, and
 therefore falls outside the scope of this License.
 
-However, linking a "work that uses the Library" with the Library
+  However, linking a "work that uses the Library" with the Library
 creates an executable that is a derivative of the Library (because it
 contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
+library".  The executable is therefore covered by this License.
 Section 6 states terms for distribution of such executables.
 
-When a "work that uses the Library" uses material from a header file
+  When a "work that uses the Library" uses material from a header file
 that is part of the Library, the object code for the work may be a
 derivative work of the Library even though the source code is not.
 Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
+linked without the Library, or if the work is itself a library.  The
 threshold for this to be true is not precisely defined by law.
 
-If such an object file uses only numerical parameters, data
+  If such an object file uses only numerical parameters, data
 structure layouts and accessors, and small macros and small inline
 functions (ten lines or less in length), then the use of the object
 file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
+work.  (Executables containing this object code plus portions of the
 Library will still fall under Section 6.)
 
-Otherwise, if the work is a derivative of the Library, you may
+  Otherwise, if the work is a derivative of the Library, you may
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
-6. As an exception to the Sections above, you may also combine or
+
+  6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
 under terms of your choice, provided that the terms permit
 modification of the work for the customer's own use and reverse
 engineering for debugging such modifications.
 
-You must give prominent notice with each copy of the work that the
+  You must give prominent notice with each copy of the work that the
 Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
+this License.  You must supply a copy of this License.  If the work
 during execution displays copyright notices, you must include the
 copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
+directing the user to the copy of this License.  Also, you must do one
 of these things:
 
-a) Accompany the work with the complete corresponding
-machine-readable source code for the Library including whatever
-changes were used in the work (which must be distributed under
-Sections 1 and 2 above); and, if the work is an executable linked
-with the Library, with the complete machine-readable "work that
-uses the Library", as object code and/or source code, so that the
-user can modify the Library and then relink to produce a modified
-executable containing the modified Library. (It is understood
-that the user who changes the contents of definitions files in the
-Library will not necessarily be able to recompile the application
-to use the modified definitions.)
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
 
-b) Use a suitable shared library mechanism for linking with the
-Library. A suitable mechanism is one that (1) uses at run time a
-copy of the library already present on the user's computer system,
-rather than copying library functions into the executable, and (2)
-will operate properly with a modified version of the library, if
-the user installs one, as long as the modified version is
-interface-compatible with the version that the work was made with.
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
 
-c) Accompany the work with a written offer, valid for at
-least three years, to give the same user the materials
-specified in Subsection 6a, above, for a charge no more
-than the cost of performing this distribution.
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
 
-d) If distribution of the work is made by offering access to copy
-from a designated place, offer equivalent access to copy the above
-specified materials from the same place.
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
 
-e) Verify that the user has already received a copy of these
-materials or that you have already sent this user a copy.
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
 
-For an executable, the required form of the "work that uses the
+  For an executable, the required form of the "work that uses the
 Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
+reproducing the executable from it.  However, as a special exception,
 the materials to be distributed need not include anything that is
 normally distributed (in either source or binary form) with the major
 components (compiler, kernel, and so on) of the operating system on
 which the executable runs, unless that component itself accompanies
 the executable.
 
-It may happen that this requirement contradicts the license
+  It may happen that this requirement contradicts the license
 restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
+accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
-7. You may place library facilities that are a work based on the
+
+  7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
 library, provided that the separate distribution of the work based on
 the Library and of the other library facilities is otherwise
 permitted, and provided that you do these two things:
 
-a) Accompany the combined library with a copy of the same work
-based on the Library, uncombined with any other library
-facilities. This must be distributed under the terms of the
-Sections above.
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
 
-b) Give prominent notice with the combined library of the fact
-that part of it is a work based on the Library, and explaining
-where to find the accompanying uncombined form of the same work.
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
 
-8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
 attempt otherwise to copy, modify, sublicense, link with, or
 distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
+rights under this License.  However, parties who have received copies,
 or rights, from you under this License will not have their licenses
 terminated so long as such parties remain in full compliance.
 
-9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
 modifying or distributing the Library (or any work based on the
 Library), you indicate your acceptance of this License to do so, and
 all its terms and conditions for copying, distributing or modifying
 the Library or works based on it.
 
-10. Each time you redistribute the Library (or any work based on the
+  10. Each time you redistribute the Library (or any work based on the
 Library), the recipient automatically receives a license from the
 original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
+subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
-11. If, as a consequence of a court judgment or allegation of patent
+
+  11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
+excuse you from the conditions of this License.  If you cannot
 distribute so as to satisfy simultaneously your obligations under this
 License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
+may not distribute the Library at all.  For example, if a patent
 license would not permit royalty-free redistribution of the Library by
 all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
@@ -1072,7 +1098,7 @@
 patents or other property right claims or to contest validity of any
 such claims; this section has the sole purpose of protecting the
 integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
+implemented by public license practices.  Many people have made
 generous contributions to the wide range of software distributed
 through that system in reliance on consistent application of that
 system; it is up to the author/donor to decide if he or she is willing
@@ -1082,49 +1108,49 @@
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
 
-12. If the distribution and/or use of the Library is restricted in
+  12. If the distribution and/or use of the Library is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Library under this License may add
 an explicit geographical distribution limitation excluding those countries,
 so that distribution is permitted only in or among countries not thus
-excluded. In such case, this License incorporates the limitation as if
+excluded.  In such case, this License incorporates the limitation as if
 written in the body of this License.
 
-13. The Free Software Foundation may publish revised and/or new
+  13. The Free Software Foundation may publish revised and/or new
 versions of the Lesser General Public License from time to time.
 Such new versions will be similar in spirit to the present version,
 but may differ in detail to address new problems or concerns.
 
-Each version is given a distinguishing version number. If the Library
+Each version is given a distinguishing version number.  If the Library
 specifies a version number of this License which applies to it and
 "any later version", you have the option of following the terms and
 conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
+the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
-14. If you wish to incorporate parts of the Library into other free
+
+  14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
+write to the author to ask for permission.  For software which is
 copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
+Software Foundation; we sometimes make exceptions for this.  Our
 decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			 NO WARRANTY
+			    NO WARRANTY
 
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
 EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
 OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
 KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
 THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
 
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
 WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
 AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
 FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
@@ -1135,72 +1161,74 @@
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		 END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Libraries
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
 
-If you develop a new library, and you want it to be of the greatest
+  If you develop a new library, and you want it to be of the greatest
 possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
+everyone can redistribute and change.  You can do so by permitting
 redistribution under these terms (or, alternatively, under the terms of the
 ordinary General Public License).
 
-To apply these terms, attach the following notices to the library. It is
+  To apply these terms, attach the following notices to the library.  It is
 safest to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least the
 "copyright" line and a pointer to where the full notice is found.
 
-
-Copyright (C) 
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
 
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
 
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 Also add information on how to contact you by electronic and paper mail.
 
 You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
+necessary.  Here is a sample; alter the names:
 
-Yoyodyne, Inc., hereby disclaims all copyright interest in the
-library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
 
-, 1 April 1990
-Ty Coon, President of Vice
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
 
 That's all there is to it!
 
+
+
 ===============================================================================
-urllib3 1.10.1 + dev
+urllib3-1.13.1
 ===============================================================================
 This is the MIT license: http://www.opensource.org/licenses/mit-license.php
 
-Copyright 2008-2014 Andrey Petrov and contributors (see CONTRIBUTORS.txt)
+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
+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 without restriction, including
 without limitation the rights to use, copy, modify, merge, publish,
 distribute, sublicense, and/or sell copies of the Software, and to
 permit persons to whom the Software is furnished to do so, subject to
 the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
 IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
 CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
@@ -1260,6 +1288,7 @@
 ===============================================================================
 ssl_match_hostname 3.4.0.2
 ===============================================================================
+
 PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 --------------------------------------------
 
@@ -1268,67 +1297,43 @@
 otherwise using this software ("Python") in source or binary form and
 its associated documentation.
 
-2. Subject to the terms and conditions of this License Agreement, PSF
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python alone
-or in any derivative version, provided, however, that PSF's License
-Agreement and PSF's notice of copyright, i.e., "Copyright (c) 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Python Software
-Foundation; All Rights Reserved" are retained in Python alone or in
-any derivative version prepared by Licensee.
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Python Software Foundation; All Rights Reserved" are retained in Python alone or
+in any derivative version prepared by Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
-or incorporates Python or any part thereof, and wants to make the
-derivative work available to others as provided herein, then Licensee
-hereby agrees to include in any such work a brief summary of the
-changes made to Python.
+or incorporates Python or any part thereof, and wants to make
+the derivative work available to others as provided herein, then
+Licensee hereby agrees to include in any such work a brief summary of
+the changes made to Python.
 
-4. PSF is making Python available to Licensee on an "AS IS" basis.
-PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. BY
-WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY
-REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY
-PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT INFRINGE ANY
-THIRD PARTY RIGHTS.
+4. PSF is making Python available to Licensee on an "AS IS"
+basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+INFRINGE ANY THIRD PARTY RIGHTS.
 
 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS A
-RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON, OR ANY
-DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
 
 6. This License Agreement will automatically terminate upon a material
 breach of its terms and conditions.
 
 7. Nothing in this License Agreement shall be deemed to create any
 relationship of agency, partnership, or joint venture between PSF and
-Licensee. This License Agreement does not grant permission to use PSF
+Licensee.  This License Agreement does not grant permission to use PSF
 trademarks or trade name in a trademark sense to endorse or promote
 products or services of Licensee, or any third party.
 
-8. By copying, installing or otherwise using Python, Licensee agrees
-to be bound by the terms and conditions of this License Agreement.
-
-===============================================================================
-pip 6.0.8
-===============================================================================
-Copyright (c) 2008-2014 The pip developers (see AUTHORS.txt file)
+8. By copying, installing or otherwise using Python, Licensee
+agrees to be bound by the terms and conditions of this License
+Agreement.
 
-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 without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-