diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2012-11-24 10:23:09 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2012-11-24 10:23:09 -0500 |
| commit | 9d1e4a7a1f340147dca2f215dc33485c31f1834e (patch) | |
| tree | dbd95ed25b1365031c31a6e25149693d570d0c26 | |
| parent | 76ea724d5b44140b7c7908a1ca89a273fe65e294 (diff) | |
| download | external_python_setuptools-9d1e4a7a1f340147dca2f215dc33485c31f1834e.tar.gz external_python_setuptools-9d1e4a7a1f340147dca2f215dc33485c31f1834e.tar.bz2 external_python_setuptools-9d1e4a7a1f340147dca2f215dc33485c31f1834e.zip | |
Added comment and updated CHANGES
--HG--
branch : distribute
extra : rebase_source : 4c828b71eced1215219f5b16d881fa1f35972744
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rw-r--r-- | setuptools/dist.py | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index c8e56c06..1912edef 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,13 @@ CHANGES * Issue #329: Properly close files created by tests for compatibility with Jython. * Work around Jython bugs #1980 and #1981. +* Issue #334: Provide workaround for packages that reference `sys.__stdout__` + such as numpy does. This change should address + `virtualenv #359 <https://github.com/pypa/virtualenv/issues/359>`_ as long + as the system encoding is UTF-8 or the IO encoding is specified in the + environment, i.e.:: + + PYTHONIOENCODING=utf8 pip install numpy ------ 0.6.30 diff --git a/setuptools/dist.py b/setuptools/dist.py index 3e9e0254..998a4dbe 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -657,6 +657,8 @@ class Distribution(_Distribution): if not isinstance(sys.stdout, io.TextIOWrapper): return _Distribution.handle_display_options(self, option_order) + # Don't wrap stdout if utf-8 is already the encoding. Provides + # workaround for #334. if sys.stdout.encoding.lower() in ('utf-8', 'utf8'): return _Distribution.handle_display_options(self, option_order) |