diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-18 14:08:20 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-06-18 14:08:20 -0500 |
| commit | a85aa143f971ebfbb31ccaf58cb82a311f9315c6 (patch) | |
| tree | eeae1529ae15884aca3301fefae768fc2e531a18 /setuptools/dist.py | |
| parent | 94fc39cb62df19e85b07658f2fa5d0b4a7bf9303 (diff) | |
| parent | 641eac6550896506fa939205f249bcfb8f057d57 (diff) | |
| download | external_python_setuptools-a85aa143f971ebfbb31ccaf58cb82a311f9315c6.tar.gz external_python_setuptools-a85aa143f971ebfbb31ccaf58cb82a311f9315c6.tar.bz2 external_python_setuptools-a85aa143f971ebfbb31ccaf58cb82a311f9315c6.zip | |
Merge Vinay Sajip's unified Python 2/3 support from distribute 3
--HG--
branch : distribute
Diffstat (limited to 'setuptools/dist.py')
| -rw-r--r-- | setuptools/dist.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py index d90acbec..62dd0eb2 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -660,6 +660,11 @@ 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) + # Print metadata in UTF-8 no matter the platform encoding = sys.stdout.encoding errors = sys.stdout.errors |