Merge remote-tracking branch 'origin/master' appcode/171.981 clion/171.982
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 15 Nov 2016 11:51:49 +0000 (12:51 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 15 Nov 2016 11:51:49 +0000 (12:51 +0100)
python/python-terminal/src/com/jetbrains/python/sdk/PyVirtualEnvTerminalCustomizer.kt

index b7573141b42a8ece39d0678d5e9d9907aeaafeaa..35cf284455c68cf4b93e124612b0adfc40f4ff2b 100644 (file)
@@ -53,7 +53,7 @@ class PyVirtualEnvTerminalCustomizer : LocalTerminalCustomizer() {
           //for other shells we read envs from activate script by the default shell and pass them to the process
           val reader = PyVirtualEnvReader(path)
           reader.activate?.let {
-            envs.putAll(reader.readShellEnv().filterKeys { k -> k in arrayOf("PATH", "PS1", "VIRTUAL_ENV", "PYTHONHOME") })
+            envs.putAll(reader.readShellEnv().filterKeys { k -> k in arrayOf("PATH", "PS1", "VIRTUAL_ENV", "PYTHONHOME", "PROMPT") })
           }
         }
       }