McSinyx/pip
1
1
Fork 0
mirror of https://github.com/pypa/pip synced 2023-12-13 21:30:23 +01:00
Code Issues Releases Activity

Merge pull request #9360 from jdufresne/json-decode-error

Browse source 
Remove Python 2 compatibility shim for json.JSONDecodeError
This commit is contained in:
Pradyun Gedam 2020-12-26 09:20:42 +00:00 committed by GitHub
parent 4e48ba838b 07ddf66f65
commit fe741a2610
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
news/7ced09a1-9af6-4190-8249-05a6328e379e.trivial.rst Normal file
View file

9
src/pip/_internal/utils/direct_url_helpers.py
View file

@ -1,3 +1,4 @@
import json
import logging
from pip._internal.models.direct_url import (
@ -11,12 +12,6 @@ from pip._internal.models.direct_url import (
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
from pip._internal.vcs import vcs
try:
from json import JSONDecodeError
except ImportError:
# PY2
JSONDecodeError = ValueError # type: ignore
if MYPY_CHECK_RUNNING:
from typing import Optional
@ -114,7 +109,7 @@ def dist_get_direct_url(dist):
return DirectUrl.from_json(dist.get_metadata(DIRECT_URL_METADATA_NAME))
except (
DirectUrlValidationError,
JSONDecodeError,
json.JSONDecodeError,
UnicodeDecodeError
) as e:
logger.warning(