aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel <g2p.code@gmail.com>2012-11-23 22:38:55 +0100
committerGabriel <g2p.code@gmail.com>2012-11-23 22:38:55 +0100
commit7fbee015f7d31185ccfc890c59dbfab1c699db82 (patch)
tree046b4d1bc61d46b3af23f729a424c7e6953566c1
parentb42f4d2e305834e4b92fabbbc56e82d6757aa984 (diff)
downloadexternal_python_setuptools-7fbee015f7d31185ccfc890c59dbfab1c699db82.tar.gz
external_python_setuptools-7fbee015f7d31185ccfc890c59dbfab1c699db82.tar.bz2
external_python_setuptools-7fbee015f7d31185ccfc890c59dbfab1c699db82.zip
Don't wrap sys.stdout if it's in the correct encoding already.
--HG-- branch : distribute extra : rebase_source : 314a8be1a2e63ceaf501ecb047a29f62302be0a0
-rw-r--r--setuptools/dist.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py
index afac180e..3e9e0254 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -657,6 +657,9 @@ class Distribution(_Distribution):
if not isinstance(sys.stdout, io.TextIOWrapper):
return _Distribution.handle_display_options(self, option_order)
+ if sys.stdout.encoding.lower() in ('utf-8', 'utf8'):
+ return _Distribution.handle_display_options(self, option_order)
+
# Print metadata in UTF-8 no matter the platform
encoding = sys.stdout.encoding
errors = sys.stdout.errors