Merge pull request pypa#4920 from asottile/no_need_for_distro_patch

Drop vendoring patch for distro
pradyunsg · Dec 15, 2017 · b0a762a · b0a762a
2 parents ad0d3f5 + 6bf55db
commit b0a762a
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 24 deletions.
diff --git a/news/22781fda-31a5-4a7e-a8f3-ee28cb974cc9.trivial b/news/22781fda-31a5-4a7e-a8f3-ee28cb974cc9.trivial
diff --git a/src/pip/_vendor/README.rst b/src/pip/_vendor/README.rst
@@ -98,7 +98,6 @@ Modifications
 * ``CacheControl`` has been modified to import its dependencies from ``pip._vendor``
 * ``packaging`` has been modified to import its dependencies from ``pip._vendor``
 * ``requests`` has been modified *not* to optionally load any C dependencies
-* Modified distro to delay importing ``argparse`` to avoid errors on 2.6
 
 
 Automatic Vendoring

diff --git a/src/pip/_vendor/distro.py b/src/pip/_vendor/distro.py
@@ -34,6 +34,7 @@
 import json
 import shlex
 import logging
+import argparse
 import subprocess
 
 
@@ -1074,8 +1075,6 @@ def _parse_distro_release_content(line):
 
 
 def main():
-    import argparse
-
     logger = logging.getLogger(__name__)
     logger.setLevel(logging.DEBUG)
     logger.addHandler(logging.StreamHandler(sys.stdout))

diff --git a/tasks/vendoring/patches/distro.patch b/tasks/vendoring/patches/distro.patch