From 6822332324ebea9625849e265f1d5f346798a4de Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Wed, 5 Mar 2014 18:18:57 +0100
Subject: [PATCH] Fix locale env  vars on mac (IDEA-121713).

---
 .../intellij/execution/configurations/GeneralCommandLine.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/platform/platform-api/src/com/intellij/execution/configurations/GeneralCommandLine.java b/platform/platform-api/src/com/intellij/execution/configurations/GeneralCommandLine.java
index 445ac0126047..f5199e35a9e9 100644
--- a/platform/platform-api/src/com/intellij/execution/configurations/GeneralCommandLine.java
+++ b/platform/platform-api/src/com/intellij/execution/configurations/GeneralCommandLine.java
@@ -281,6 +281,10 @@ public class GeneralCommandLine implements UserDataHolder {
       environment.putAll(PlatformUtils.isAppCode() ? System.getenv() // Temporarily fix for OC-8606
                                                    : EnvironmentUtil.getEnvironmentMap());
     }
+    
+    if (PlatformUtils.isPyCharm()) { //We test the approach on snakes first. If it won't cause problems then apply for all (IDEA-118946)
+      EncodingEnvironmentUtil.fixDefaultEncodingIfMac(this, null);      
+    }
 
     if (!myEnvParams.isEmpty()) {
       if (SystemInfo.isWindows) {