diff options
| author | Nate Prewitt <nate.prewitt@gmail.com> | 2022-01-03 10:46:19 -0700 |
|---|---|---|
| committer | Nate Prewitt <nate.prewitt@gmail.com> | 2022-01-14 09:49:09 -0700 |
| commit | cc21ec2a2eb8cfcb480a237d3890a1cd40317402 (patch) | |
| tree | 181742e36c0394dc5fef652f7966fd0d73a80b3f /tools | |
| parent | 7f8a6844037fb7255cfd0d34ff8e8cf44f2598d4 (diff) | |
| download | pip-cc21ec2a2eb8cfcb480a237d3890a1cd40317402.tar.gz | |
Upgrade Requests to 2.27.1
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/vendoring/patches/requests.patch | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/tools/vendoring/patches/requests.patch b/tools/vendoring/patches/requests.patch index 04e6339f4..670c1b0ca 100644 --- a/tools/vendoring/patches/requests.patch +++ b/tools/vendoring/patches/requests.patch @@ -81,12 +81,14 @@ index 409b7b028..9e2937167 100644 import sys -@@ -28,10 +25,14 @@ is_py2 = (_ver[0] == 2) +@@ -28,12 +28,14 @@ is_py2 = (_ver[0] == 2) #: Python 3.x? is_py3 = (_ver[0] == 3) +-has_simplejson = False -try: - import simplejson as json +- has_simplejson = True -except ImportError: - import json +# Note: We've patched out simplejson support in pip because it prevents @@ -100,6 +102,18 @@ index 409b7b028..9e2937167 100644 # --------- # Specifics +@@ -68,10 +70,7 @@ elif is_py3: + # Keep OrderedDict for backwards compatibility. + from collections import OrderedDict + from collections.abc import Callable, Mapping, MutableMapping +- if has_simplejson: +- from simplejson import JSONDecodeError +- else: +- from json import JSONDecodeError ++ from json import JSONDecodeError + + builtin_str = str + str = str diff --git a/src/pip/_vendor/requests/help.py b/src/pip/_vendor/requests/help.py index 3a843404c..745f0d7b3 100644 |