Move six to pkg_resources for use there.

--HG--
branch : feature/issue-229

Makefile

@@ -2,10 +2,7 @@ empty:
 	exit 1
 
 update-vendored:
-	rm -rf pkg_resources/_vendor/packaging
-	python3.5 -m pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
+	rm -rf pkg_resources/_vendor/packaging*
+	rm -rf pkg_resources/_vendor/six*
+	python3 -m pip install -r pkg_resources/_vendor/vendored.txt -t pkg_resources/_vendor/
 	rm -rf pkg_resources/_vendor/*.{egg,dist}-info
-
-	rm -rf setuptools/_vendor/six
-	python3.5 -m pip install -r setuptools/_vendor/vendored.txt -t setuptools/_vendor/
-	rm -rf setuptools/_vendor/*.{egg,dist}-info

pkg_resources/_vendor/vendored.txt

 packaging==15.3
+six==1.10.0

pkg_resources/extern/__init__.py

@@ -67,5 +67,5 @@ class VendorImporter:
         if self not in sys.meta_path:
             sys.meta_path.append(self)
 
-names = 'packaging',
+names = 'packaging', 'six'
 VendorImporter(__name__, names).install()

setuptools/_vendor/vendored.txt

-six==1.10.0

setuptools/extern/__init__.py

@@ -2,4 +2,4 @@ from pkg_resources.extern import VendorImporter
 
 
 names = 'six',
-VendorImporter(__name__, names).install()
+VendorImporter(__name__, names, 'pkg_resources._vendor').install()