summaryrefslogtreecommitdiff
path: root/dev-python/pip/files
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2015-08-24 12:04:58 +0200
committerJustin Lecher <jlec@gentoo.org>2015-08-24 12:12:14 +0200
commit393e765615102a470b94669a61e790c38d99c268 (patch)
treeab5e482ba282751e811424e66c211d91a9efad91 /dev-python/pip/files
parentf306395782c35d86d0e40bfc4458b49193aacadb (diff)
downloadgentoo-393e765615102a470b94669a61e790c38d99c268.tar.gz
gentoo-393e765615102a470b94669a61e790c38d99c268.tar.xz
dev-python/pip: Version Bump
unbundle all vendored libs Package-Manager: portage-2.2.20.1 Signed-off-by: Justin Lecher <jlec@gentoo.org>
Diffstat (limited to 'dev-python/pip/files')
-rw-r--r--dev-python/pip/files/pip-7.1.2-unbundle.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/dev-python/pip/files/pip-7.1.2-unbundle.patch b/dev-python/pip/files/pip-7.1.2-unbundle.patch
new file mode 100644
index 00000000000..70adc20ead5
--- /dev/null
+++ b/dev-python/pip/files/pip-7.1.2-unbundle.patch
@@ -0,0 +1,34 @@
+ pip/_vendor/__init__.py | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
+index ef8851d..349d022 100644
+--- a/pip/_vendor/__init__.py
++++ b/pip/_vendor/__init__.py
+@@ -14,7 +14,7 @@ import sys
+ # Downstream redistributors which have debundled our dependencies should also
+ # patch this value to be true. This will trigger the additional patching
+ # to cause things like "six" to be available as pip.
+-DEBUNDLED = False
++DEBUNDLED = True
+
+ # By default, look in this directory for a bunch of .whl files which we will
+ # add to the beginning of sys.path before attempting to import anything. This
+@@ -29,13 +29,10 @@ WHEEL_DIR = os.path.abspath(os.path.dirname(__file__))
+ def vendored(modulename):
+ vendored_name = "{0}.{1}".format(__name__, modulename)
+
+- try:
+- __import__(vendored_name, globals(), locals(), level=0)
+- except ImportError:
+- __import__(modulename, globals(), locals(), level=0)
+- sys.modules[vendored_name] = sys.modules[modulename]
+- base, head = vendored_name.rsplit(".", 1)
+- setattr(sys.modules[base], head, sys.modules[modulename])
++ __import__(modulename, globals(), locals(), level=0)
++ sys.modules[vendored_name] = sys.modules[modulename]
++ base, head = vendored_name.rsplit(".", 1)
++ setattr(sys.modules[base], head, sys.modules[modulename])
+
+
+ # If we're operating in a debundled setup, then we want to go ahead and trigger