Merge pull request conda#10000 from cjmartian/colorama-fix

colorama fix
LouisColman · Jun 12, 2020 · fb127b1 · fb127b1
2 parents bf3404a + 04e55ec
commit fb127b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/conda/activate.py b/conda/activate.py
@@ -639,6 +639,9 @@ def index_of_path(paths, test_path):
     def _build_activate_shell_custom(self, export_vars):
         # A method that can be overriden by shell-specific implementations.
         # The signature of this method may change in the future.
+        if on_win:
+            import ctypes
+            export_vars.update({"PYTHONIOENCODING": ctypes.cdll.kernel32.GetACP(),})
         pass
 
     def _update_prompt(self, set_vars, conda_prompt_modifier):

diff --git a/conda/shell/condabin/_conda_activate.bat b/conda/shell/condabin/_conda_activate.bat
@@ -50,3 +50,4 @@
 @IF "%CONDA_TEST_SAVE_TEMPS%x"=="x" @DEL /F /Q "%_TEMP_SCRIPT_PATH%"
 @SET _TEMP_SCRIPT_PATH=
 @SET "PROMPT=%CONDA_PROMPT_MODIFIER%%PROMPT%" 
+@IF DEFINED PYTHONIOENCODING chcp %PYTHONIOENCODING:~2% > NUL