Merge remote-tracking branch 'origin/master'

python/helpers/pycharm/django_manage_shell.py

@@ -15,14 +15,17 @@ def run():
   if not manage_file:
       manage_file = 'manage'
 
-  execute_manager_original = management.execute_manager
-
-  def execute_manager(settings_mod):
+  def execute_manager(settings_mod, argv = None):
       management.setup_environ(settings_mod)
 
   management.execute_manager = execute_manager
 
+  def execute_from_command_line(argv=None):
+    pass
+
+  management.execute_from_command_line = execute_from_command_line
+
   fixGetpass()
 
-#  run_module(manage_file, None, '__main__', True)
+  run_module(manage_file, None, '__main__', True)
 

python/src/com/jetbrains/python/packaging/PyPackageManager.java

@@ -257,7 +257,7 @@ public class PyPackageManager {
   private void installManagement(String name) throws PyExternalProcessException {
     final File helperFile = PythonHelpersLocator.getHelperFile(name + ".tar.gz");
 
-    String helpersPath = getHelperPath(name);
+    final String helpersPath = getHelperPath(name);
 
     ProcessOutput output = getHelperOutput(PACKAGING_TOOL, Lists.newArrayList(UNTAR, helpersPath), false, helperFile.getParent());
 
@@ -271,7 +271,7 @@ public class PyPackageManager {
     }
     final String fileName = dirName + name + File.separatorChar + "setup.py";
     try {
-      output = getProcessOutput(fileName, Collections.<String>singletonList(INSTALL), true, dirName);
+      output = getProcessOutput(fileName, Collections.<String>singletonList(INSTALL), true, dirName + name);
       final int retcode = output.getExitCode();
       if (output.isTimeout()) {
         throw new PyExternalProcessException(ERROR_TIMEOUT, fileName, Lists.newArrayList(INSTALL), "Timed out");

python/src/com/jetbrains/python/sdk/PythonEnvUtil.java

@@ -62,7 +62,7 @@ public class PythonEnvUtil {
       assert source != null;
       Set<String> vals = Sets.newHashSet(source.split(File.pathSeparator));
       if (!vals.contains(value)) {
-        return value + File.pathSeparatorChar + source;
+        return source + File.pathSeparatorChar + value;
       }
       else {
         return source;

python/src/com/jetbrains/python/testing/attest/PythonAtTestCommandLineState.java

@@ -38,7 +38,7 @@ public class PythonAtTestCommandLineState extends PythonTestCommandLineStateBase
       pythonPath.add(1, myConfig.getFolderName());
     }
     else {
-      pythonPath.add(1, new File(myConfig.getWorkingDirectory(), myConfig.getScriptName()).getParent());
+      pythonPath.add(1, new File(myConfig.getScriptName()).getParent());
     }
     return pythonPath;
   }

python/src/com/jetbrains/python/testing/doctest/PythonDocTestCommandLineState.java

@@ -38,7 +38,7 @@ public class PythonDocTestCommandLineState extends PythonTestCommandLineStateBas
       pythonPath.add(1, myConfig.getFolderName());
     }
     else {
-      pythonPath.add(1, new File(myConfig.getWorkingDirectory(), myConfig.getScriptName()).getParent());
+      pythonPath.add(1, new File(myConfig.getScriptName()).getParent());
     }
     return pythonPath;
   }

python/src/com/jetbrains/python/testing/unittest/PythonUnitTestCommandLineState.java

@@ -42,7 +42,7 @@ public class PythonUnitTestCommandLineState extends
       pythonPath.add(1, myConfig.getFolderName());
     }
     else {
-      pythonPath.add(1, new File(myConfig.getWorkingDirectory(), myConfig.getScriptName()).getParent());
+      pythonPath.add(1, new File(myConfig.getScriptName()).getParent());
     }
     return pythonPath;
   }