[Pytest-commit] commit/tox: hpk42: Merged in tkhyn/tox/fix_console_encoding (pull request #115)

[commits-noreply at bitbucket.org]

1 new commit in tox:

https://bitbucket.org/hpk42/tox/commits/d835cca51418/
Changeset:   d835cca51418
User:        hpk42
Date:        2014-08-08 12:59:41
Summary:     Merged in tkhyn/tox/fix_console_encoding (pull request #115)

Fixed console encoding issue
Affected #:  2 files

diff -r 30fcc85296981a9fc3f5b8782c91817d5a569357 -r d835cca51418210730ba8c9cc88a8829bc7cb05d tests/test_venv.py
--- a/tests/test_venv.py
+++ b/tests/test_venv.py
@@ -552,8 +552,6 @@
     assert 'install' in l[0].args
     env = l[0].env
     assert env is not None
-    assert 'PYTHONIOENCODING' in env
-    assert env['PYTHONIOENCODING'] == 'utf_8'
 
 def test_run_custom_install_command(newmocksession):
     mocksession = newmocksession([], """

diff -r 30fcc85296981a9fc3f5b8782c91817d5a569357 -r d835cca51418210730ba8c9cc88a8829bc7cb05d tox/_venv.py
--- a/tox/_venv.py
+++ b/tox/_venv.py
@@ -1,5 +1,6 @@
 from __future__ import with_statement
 import sys, os
+import codecs
 import py
 import tox
 from tox._config import DepConfig
@@ -276,11 +277,13 @@
                 del os.environ[x]
             except KeyError:
                 pass
-        env = dict(PYTHONIOENCODING='utf_8')
-        if extraenv is not None:
-            env.update(extraenv)
+        old_stdout = sys.stdout
+        sys.stdout = codecs.getwriter('utf8')(sys.stdout)
+        if extraenv is None:
+            extraenv = {}
         self._pcall(argv, cwd=self.envconfig.config.toxinidir,
-                    extraenv=env, action=action)
+                    extraenv=extraenv, action=action)
+        sys.stdout = old_stdout
 
     def _install(self, deps, extraopts=None, action=None):
         if not deps:

Repository URL: https://bitbucket.org/hpk42/tox/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.