aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/dist.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2012-11-24 10:23:09 -0500
committerJason R. Coombs <jaraco@jaraco.com>2012-11-24 10:23:09 -0500
commit9d1e4a7a1f340147dca2f215dc33485c31f1834e (patch)
treedbd95ed25b1365031c31a6e25149693d570d0c26 /setuptools/dist.py
parent76ea724d5b44140b7c7908a1ca89a273fe65e294 (diff)
downloadexternal_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
Diffstat (limited to 'setuptools/dist.py')
-rw-r--r--setuptools/dist.py2
1 files changed, 2 insertions, 0 deletions
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)