diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-12-24 10:02:01 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-12-24 10:02:01 -0500 |
| commit | 044375318681ee22638271b9fab32225ec23a3ae (patch) | |
| tree | c10e17ea97a2cb80f3649ccb699d955a0cbd96c5 | |
| parent | 0c3bf692236350f5c2c2cab5b235e9b6d3518fcb (diff) | |
| download | python-setuptools-git-044375318681ee22638271b9fab32225ec23a3ae.tar.gz | |
Fallback to UTF-8 also if no charset is specified. Fixes #898.
| -rwxr-xr-x | ez_setup.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ez_setup.py b/ez_setup.py index 950e120d..83c05958 100755 --- a/ez_setup.py +++ b/ez_setup.py @@ -366,12 +366,13 @@ def _resolve_version(version): meta_url = urljoin(DEFAULT_URL, '/pypi/setuptools/json') resp = urlopen(meta_url) + fallback = 'UTF-8' with contextlib.closing(resp): try: - charset = resp.info().get_content_charset() + charset = resp.info().get_content_charset(fallback) except Exception: - # Python 2 compat; assume UTF-8 - charset = 'UTF-8' + # Python 2 compat + charset = fallback reader = codecs.getreader(charset) doc = json.load(reader(resp)) |