Merge branch 'master' into feature/implicit-bootstrapfeature/implicit-bootstrap

1 files changed, 6 insertions, 1 deletions

diff --git a/pavement.py b/pavement.py
index b5220d10..81ff6f12 100644
--- a/pavement.py
+++ b/pavement.py
@@ -22,7 +22,11 @@ def rewrite_packaging(pkg_files, new_root):
     """
     for file in pkg_files.glob('*.py'):
         text = file.text()
-        text = re.sub(r' (pyparsing|six)', rf' {new_root}.\1', text)
+        text = re.sub(r' (pyparsing)', rf' {new_root}.\1', text)
+        text = text.replace(
+            'from six.moves.urllib import parse',
+            'from urllib import parse',
+        )
         file.write_text(text)
 
 
@@ -50,6 +54,7 @@ def install(vendor):
     subprocess.check_call(install_args)
     remove_all(vendor.glob('*.dist-info'))
     remove_all(vendor.glob('*.egg-info'))
+    remove_all(vendor.glob('six.py'))
     (vendor / '__init__.py').write_text('')