Merge pull request conda#6588 from kalefranz/fix-6579-python-not-reco…

…gnized fix conda#6579 python not recognized as command
happyyang · Dec 29, 2017 · f5f6419 · f5f6419
2 parents 03df284 + a9fe951
commit f5f6419
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/conda/activate.py b/conda/activate.py
@@ -266,6 +266,12 @@ def build_activate(self, env_name_or_prefix):
 
         self._update_prompt(set_vars, conda_prompt_modifier)
 
+        if on_win and self.shell == 'cmd.exe':
+            import ctypes
+            export_vars.update({
+                "PYTHONIOENCODING": ctypes.cdll.kernel32.GetACP(),
+            })
+
         return {
             'unset_vars': (),
             'set_vars': set_vars,

diff --git a/conda/shell/Library/bin/conda.bat b/conda/shell/Library/bin/conda.bat
@@ -8,9 +8,6 @@
     )
 :skip_conda_exe_dev
 
-@FOR /F "delims=" %%i IN ('@python -c "import ctypes; print(ctypes.cdll.kernel32.GetACP())"') DO @SET "PYTHONIOENCODING=%%i"
-@chcp %PYTHONIOENCODING% > NUL
-
 @IF "%1"=="activate" GOTO :DO_ACTIVATE
 @IF "%1"=="deactivate" GOTO :DO_DEACTIVATE
 
@@ -43,6 +40,9 @@
 @DEL /F /Q "%_TEMP_SCRIPT_PATH%"
 @SET _TEMP_SCRIPT_PATH=
 @SET "PROMPT=%CONDA_PROMPT_MODIFIER%%PROMPT%"
+
+@IF NOT "%PYTHONIOENCODING%"=="" @chcp %PYTHONIOENCODING% > NUL
+
 @GOTO :End
 
 :DO_DEACTIVATE

diff --git a/tests/test_activate.py b/tests/test_activate.py
@@ -33,6 +33,13 @@
 log = getLogger(__name__)
 
 
+if on_win:
+    import ctypes
+    PYTHONIOENCODING = ctypes.cdll.kernel32.GetACP()
+else:
+    PYTHONIOENCODING = None
+
+
 class ActivatorUnitTests(TestCase):
 
     def test_activate_environment_not_found(self):
@@ -274,7 +281,6 @@ def test_activate_same_environment(self):
                         'CONDA_PROMPT_MODIFIER': "(%s) " % td,
                         'CONDA_SHLVL': 1,
                     }
-
                     assert builder['unset_vars'] == ()
                     assert builder['set_vars'] == {}
                     assert builder['export_vars'] == export_vars
@@ -478,6 +484,7 @@ def test_posix_basic(self):
                 'ps1': os.environ.get('PS1', ''),
             }
 
+    @pytest.mark.skipif(not on_win, reason="cmd.exe only on Windows")
     def test_cmd_exe_basic(self):
         activator = Activator('cmd.exe')
         self.make_dot_d_files(activator.script_extension)
@@ -500,13 +507,15 @@ def test_cmd_exe_basic(self):
         @SET "CONDA_PYTHON_EXE=%(sys_executable)s"
         @SET "CONDA_SHLVL=1"
         @SET "PATH=%(new_path)s"
+        @SET "PYTHONIOENCODING=%(PYTHONIOENCODING)s"
         @CALL "%(activate1)s"
         """) % {
             'converted_prefix': activator.path_conversion(self.prefix),
             'native_prefix': self.prefix,
             'new_path': activator.pathsep_join(new_path_parts),
             'sys_executable': activator.path_conversion(sys.executable),
             'activate1': activator.path_conversion(join(self.prefix, 'etc', 'conda', 'activate.d', 'activate1.bat')),
+            'PYTHONIOENCODING': PYTHONIOENCODING,
         }
 
         with env_vars({