also remove vendored urllib and add python3-six as depedency in turn

2 files changed, 72 insertions, 10 deletions

diff --git a/debian/control b/debian/control
index 55dc71849..6d8b593f8 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Depends: adduser,
          lsb-base (>= 3.1-23.2),
          netdata-data (=${source:Version}),
          python3,
+         python3-six,
          python3-urllib3,
          python3-yaml,
          ${misc:Depends},
diff --git a/debian/patches/0001-python-libraries-removed-from-make.patch b/debian/patches/0001-python-libraries-removed-from-make.patch
index c2ad8f661..ed5b314f8 100644
--- a/debian/patches/0001-python-libraries-removed-from-make.patch
+++ b/debian/patches/0001-python-libraries-removed-from-make.patch
@@ -3,19 +3,20 @@ Date: Wed, 4 Apr 2018 14:22:34 +0200
 Subject: python libraries removed from make. remove unused contrib files
 
 ---
- python.d/Makefile.am                     | 42 --------------------------------
- python.d/python_modules/bases/loaders.py |  4 +--
- web/Makefile.am                          | 32 ------------------------
- 3 files changed, 2 insertions(+), 76 deletions(-)
+ python.d/Makefile.am                     | 106 -------------------------------
+ python.d/python_modules/bases/loaders.py |   4 +-
+ web/Makefile.am                          |  32 ----------
+ 3 files changed, 2 insertions(+), 140 deletions(-)
 
 diff --git a/python.d/Makefile.am b/python.d/Makefile.am
-index a5fcc73..29d8c45 100644
+index a5fcc73..3349ccf 100644
 --- a/python.d/Makefile.am
 +++ b/python.d/Makefile.am
-@@ -97,48 +97,6 @@ dist_third_party_DATA = \
+@@ -96,109 +96,3 @@ dist_third_party_DATA = \
+     python_modules/third_party/ordereddict.py \
      python_modules/third_party/lm_sensors.py \
      $(NULL)
- 
+-
 -pythonyaml2dir=$(pythonmodulesdir)/pyyaml2
 -dist_pythonyaml2_DATA = \
 -    python_modules/pyyaml2/__init__.py \
@@ -58,9 +59,69 @@ index a5fcc73..29d8c45 100644
 -    python_modules/pyyaml3/tokens.py \
 -    $(NULL)
 -
- python_urllib3dir=$(pythonmodulesdir)/urllib3
- dist_python_urllib3_DATA = \
-     python_modules/urllib3/__init__.py \
+-python_urllib3dir=$(pythonmodulesdir)/urllib3
+-dist_python_urllib3_DATA = \
+-    python_modules/urllib3/__init__.py \
+-    python_modules/urllib3/_collections.py \
+-    python_modules/urllib3/connection.py \
+-    python_modules/urllib3/connectionpool.py \
+-    python_modules/urllib3/exceptions.py \
+-    python_modules/urllib3/fields.py \
+-    python_modules/urllib3/filepost.py \
+-    python_modules/urllib3/response.py \
+-    python_modules/urllib3/poolmanager.py \
+-    python_modules/urllib3/request.py \
+-    $(NULL)
+-
+-python_urllib3_utildir=$(python_urllib3dir)/util
+-dist_python_urllib3_util_DATA = \
+-    python_modules/urllib3/util/__init__.py \
+-    python_modules/urllib3/util/connection.py \
+-    python_modules/urllib3/util/request.py \
+-    python_modules/urllib3/util/response.py \
+-    python_modules/urllib3/util/retry.py \
+-    python_modules/urllib3/util/selectors.py \
+-    python_modules/urllib3/util/ssl_.py \
+-    python_modules/urllib3/util/timeout.py \
+-    python_modules/urllib3/util/url.py \
+-    python_modules/urllib3/util/wait.py \
+-    $(NULL)
+-
+-python_urllib3_packagesdir=$(python_urllib3dir)/packages
+-dist_python_urllib3_packages_DATA = \
+-    python_modules/urllib3/packages/__init__.py \
+-    python_modules/urllib3/packages/ordered_dict.py \
+-    python_modules/urllib3/packages/six.py \
+-    $(NULL)
+-
+-python_urllib3_backportsdir=$(python_urllib3_packagesdir)/backports
+-dist_python_urllib3_backports_DATA = \
+-    python_modules/urllib3/packages/backports/__init__.py \
+-    python_modules/urllib3/packages/backports/makefile.py \
+-    $(NULL)
+-
+-python_urllib3_ssl_match_hostnamedir=$(python_urllib3_packagesdir)/ssl_match_hostname
+-dist_python_urllib3_ssl_match_hostname_DATA = \
+-    python_modules/urllib3/packages/ssl_match_hostname/__init__.py \
+-    python_modules/urllib3/packages/ssl_match_hostname/_implementation.py \
+-    $(NULL)
+-
+-python_urllib3_contribdir=$(python_urllib3dir)/contrib
+-dist_python_urllib3_contrib_DATA = \
+-    python_modules/urllib3/contrib/__init__.py \
+-    python_modules/urllib3/contrib/appengine.py \
+-    python_modules/urllib3/contrib/ntlmpool.py \
+-    python_modules/urllib3/contrib/pyopenssl.py \
+-    python_modules/urllib3/contrib/securetransport.py \
+-    python_modules/urllib3/contrib/socks.py \
+-    $(NULL)
+-
+-python_urllib3_securetransportdir=$(python_urllib3_contribdir)/_securetransport
+-dist_python_urllib3_securetransport_DATA = \
+-    python_modules/urllib3/contrib/_securetransport/__init__.py \
+-    python_modules/urllib3/contrib/_securetransport/bindings.py \
+-    python_modules/urllib3/contrib/_securetransport/low_level.py \
+-    $(NULL)
 diff --git a/python.d/python_modules/bases/loaders.py b/python.d/python_modules/bases/loaders.py
 index d18b9dc..71ba221 100644
 --- a/python.d/python_modules/bases/loaders.py