aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-12-16 19:05:43 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-12-16 19:05:43 -0500
commitd8a425e00d05c0cd0896b6e684b18304c6bbf717 (patch)
tree327e5ed6a84f940d2510357c9392235145877e91
parentcfcfccb6c78490ed368fa08d7ee84418ac4706a6 (diff)
downloadexternal_python_setuptools-d8a425e00d05c0cd0896b6e684b18304c6bbf717.tar.gz
external_python_setuptools-d8a425e00d05c0cd0896b6e684b18304c6bbf717.tar.bz2
external_python_setuptools-d8a425e00d05c0cd0896b6e684b18304c6bbf717.zip
In resolve version, always cast to a string (avoiding Unicode on Python 2). Fixes #476.
-rw-r--r--CHANGES.txt7
-rw-r--r--ez_setup.py2
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 4e71bd72..3764d799 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,13 @@ CHANGES
=======
+------
+19.1.1
+------
+
+* Issue #476: Cast version to string (using default encoding)
+ to avoid creating Unicode types on Python 2 clients.
+
----
19.1
----
diff --git a/ez_setup.py b/ez_setup.py
index 1320ac92..39ea44bc 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -354,7 +354,7 @@ def _resolve_version(version):
reader = codecs.getreader(charset)
doc = json.load(reader(resp))
- return doc['info']['version']
+ return str(doc['info']['version'])
def _build_install_args(options):