|
1 In-house patch to 'unbundle' requests v2.5.1 (which has a known CVE) to |
|
2 instead use requests v2.6.0 which is already available in Solaris. |
|
3 |
|
4 --- pip-6.0.8/pip/__init__.py.orig 2015-06-03 20:10:13.002501253 -0700 |
|
5 +++ pip-6.0.8/pip/__init__.py 2015-06-03 20:10:57.018903229 -0700 |
|
6 @@ -16,9 +16,7 @@ from pip.vcs import git, mercurial, subv |
|
7 from pip.baseparser import ConfigOptionParser, UpdatingDefaultsHelpFormatter |
|
8 from pip.commands import get_summaries, get_similar_commands |
|
9 from pip.commands import commands_dict |
|
10 -from pip._vendor.requests.packages.urllib3.exceptions import ( |
|
11 - InsecureRequestWarning, |
|
12 -) |
|
13 +from requests.packages.urllib3.exceptions import InsecureRequestWarning |
|
14 |
|
15 |
|
16 # assignment for flake8 to be happy |
|
17 |
|
18 --- pip-6.0.8/pip/_vendor/cachecontrol/adapter.py.orig 2015-06-03 20:13:32.884043045 -0700 |
|
19 +++ pip-6.0.8/pip/_vendor/cachecontrol/adapter.py 2015-06-03 20:13:51.401124573 -0700 |
|
20 @@ -1,6 +1,6 @@ |
|
21 import functools |
|
22 |
|
23 -from pip._vendor.requests.adapters import HTTPAdapter |
|
24 +from requests.adapters import HTTPAdapter |
|
25 |
|
26 from .controller import CacheController |
|
27 from .cache import DictCache |
|
28 |
|
29 --- pip-6.0.8/pip/_vendor/cachecontrol/compat.py.orig 2015-06-03 20:14:32.456221635 -0700 |
|
30 +++ pip-6.0.8/pip/_vendor/cachecontrol/compat.py 2015-06-03 20:15:13.070994049 -0700 |
|
31 @@ -12,5 +12,5 @@ except ImportError: |
|
32 |
|
33 # Handle the case where the requests has been patched to not have urllib3 |
|
34 # bundled as part of it's source. |
|
35 -from pip._vendor.requests.packages.urllib3.response import HTTPResponse |
|
36 -from pip._vendor.requests.packages.urllib3.util import is_fp_closed |
|
37 +from requests.packages.urllib3.response import HTTPResponse |
|
38 +from requests.packages.urllib3.util import is_fp_closed |
|
39 |
|
40 --- pip-6.0.8/pip/_vendor/cachecontrol/controller.py.orig 2015-06-03 20:15:52.523400877 -0700 |
|
41 +++ pip-6.0.8/pip/_vendor/cachecontrol/controller.py 2015-06-03 20:16:13.267223970 -0700 |
|
42 @@ -6,7 +6,7 @@ import calendar |
|
43 import time |
|
44 from email.utils import parsedate_tz |
|
45 |
|
46 -from pip._vendor.requests.structures import CaseInsensitiveDict |
|
47 +from requests.structures import CaseInsensitiveDict |
|
48 |
|
49 from .cache import DictCache |
|
50 from .serialize import Serializer |
|
51 |
|
52 --- pip-6.0.8/pip/_vendor/cachecontrol/serialize.py.orig 2015-06-03 20:17:00.074044178 -0700 |
|
53 +++ pip-6.0.8/pip/_vendor/cachecontrol/serialize.py 2015-06-03 20:17:09.414723163 -0700 |
|
54 @@ -3,7 +3,7 @@ import io |
|
55 import json |
|
56 import zlib |
|
57 |
|
58 -from pip._vendor.requests.structures import CaseInsensitiveDict |
|
59 +from requests.structures import CaseInsensitiveDict |
|
60 |
|
61 from .compat import HTTPResponse, pickle |
|
62 |
|
63 --- pip-6.0.8/pip/download.py.orig 2015-06-03 20:19:11.208085248 -0700 |
|
64 +++ pip-6.0.8/pip/download.py 2015-06-03 20:21:09.714266385 -0700 |
|
65 @@ -27,17 +27,19 @@ from pip.utils.filesystem import check_p |
|
66 from pip.utils.ui import DownloadProgressBar, DownloadProgressSpinner |
|
67 from pip.locations import write_delete_marker_file |
|
68 from pip.vcs import vcs |
|
69 -from pip._vendor import requests, six |
|
70 -from pip._vendor.requests.adapters import BaseAdapter, HTTPAdapter |
|
71 -from pip._vendor.requests.auth import AuthBase, HTTPBasicAuth |
|
72 -from pip._vendor.requests.models import Response |
|
73 -from pip._vendor.requests.structures import CaseInsensitiveDict |
|
74 -from pip._vendor.requests.packages import urllib3 |
|
75 +from pip._vendor import six |
|
76 from pip._vendor.cachecontrol import CacheControlAdapter |
|
77 from pip._vendor.cachecontrol.caches import FileCache |
|
78 from pip._vendor.lockfile import LockError |
|
79 from pip._vendor.six.moves import xmlrpc_client |
|
80 |
|
81 +import requests |
|
82 +from requests.adapters import BaseAdapter, HTTPAdapter |
|
83 +from requests.auth import AuthBase, HTTPBasicAuth |
|
84 +from requests.models import Response |
|
85 +from requests.structures import CaseInsensitiveDict |
|
86 +from requests.packages import urllib3 |
|
87 + |
|
88 |
|
89 __all__ = ['get_file_content', |
|
90 'is_url', 'url_to_path', 'path_to_url', |
|
91 |
|
92 --- pip-6.0.8/pip/index.py.orig 2015-06-03 20:21:43.458489848 -0700 |
|
93 +++ pip-6.0.8/pip/index.py 2015-06-03 20:22:16.929267163 -0700 |
|
94 @@ -26,9 +26,10 @@ from pip.models import PyPI |
|
95 from pip.wheel import Wheel, wheel_ext |
|
96 from pip.pep425tags import supported_tags, supported_tags_noarch, get_platform |
|
97 from pip.req.req_requirement import InstallationCandidate |
|
98 -from pip._vendor import html5lib, requests, pkg_resources, six |
|
99 +from pip._vendor import html5lib, pkg_resources, six |
|
100 from pip._vendor.packaging.version import parse as parse_version |
|
101 -from pip._vendor.requests.exceptions import SSLError |
|
102 +import requests |
|
103 +from requests.exceptions import SSLError |
|
104 |
|
105 |
|
106 __all__ = ['PackageFinder'] |
|
107 |
|
108 --- pip-6.0.8/pip/req/req_set.py.orig 2015-06-03 20:23:31.735567930 -0700 |
|
109 +++ pip-6.0.8/pip/req/req_set.py 2015-06-03 20:23:55.732059685 -0700 |
|
110 @@ -4,7 +4,6 @@ import logging |
|
111 import os |
|
112 |
|
113 from pip._vendor import pkg_resources |
|
114 -from pip._vendor import requests |
|
115 |
|
116 from pip.download import (url_to_path, unpack_url) |
|
117 from pip.exceptions import (InstallationError, BestVersionAlreadyInstalled, |
|
118 @@ -16,6 +15,7 @@ from pip.utils import (display_path, rmt |
|
119 from pip.utils.logging import indent_log |
|
120 from pip.vcs import vcs |
|
121 from pip.wheel import wheel_ext |
|
122 +import requests |
|
123 |
|
124 |
|
125 logger = logging.getLogger(__name__) |