Restore Python 2.7 compatibility

70fb4bec · Jason R. Coombs · 5919897c · 70fb4bec
Commit 70fb4bec authored Dec 15, 2015 by Jason R. Coombs
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

ez_setup.py ez_setup.py +5 -1

No files found.
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -346,7 +346,11 @@ def _resolve_version(version):

    resp = urlopen('https://pypi.python.org/pypi/setuptools/json')
    with contextlib.closing(resp):
-        charset = resp.info().get_content_charset()
+        try:
+            charset = resp.info().get_content_charset()
+        except Exception:
+            # Python 2 compat; assume UTF-8
+            charset = 'UTF-8'
        reader = codecs.getreader(charset)
        doc = json.load(reader(resp))