Added comment and updated CHANGES

--HG--
branch : distribute
extra : rebase_source : 4c828b71eced1215219f5b16d881fa1f35972744

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

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)