Merge branch 'refactor-package-manager'
authorAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Fri, 12 Sep 2014 13:03:52 +0000 (17:03 +0400)
committerAndrey Vlasovskikh <andrey.vlasovskikh@jetbrains.com>
Fri, 12 Sep 2014 13:03:52 +0000 (17:03 +0400)
1  2 
python/ide/src/com/jetbrains/python/newProject/actions/AbstractProjectSettingsStep.java

index 7b1015f01c74b0d6ae00cd2cd10befa113379353,9e214aeb8be3f09cba62dcd24320285a85c263f0..6514741fda4528f840a65ff9034c465aa002b683
@@@ -33,16 -33,10 +33,11 @@@ import com.jetbrains.python.configurati
  import com.jetbrains.python.configuration.VirtualEnvProjectFilter;
  import com.jetbrains.python.newProject.PyFrameworkProjectGenerator;
  import com.jetbrains.python.newProject.PythonProjectGenerator;
- import com.jetbrains.python.packaging.PyExternalProcessException;
- import com.jetbrains.python.packaging.PyPackage;
  import com.jetbrains.python.packaging.PyPackageManager;
- import com.jetbrains.python.packaging.PyPackageManagerImpl;
+ import com.jetbrains.python.sdk.PySdkUtil;
  import com.jetbrains.python.sdk.PythonSdkType;
- import com.jetbrains.python.sdk.flavors.JythonSdkFlavor;
- import com.jetbrains.python.sdk.flavors.PyPySdkFlavor;
- import com.jetbrains.python.sdk.flavors.PythonSdkFlavor;
  import icons.PythonIcons;
 +import org.jetbrains.annotations.NotNull;
  import org.jetbrains.annotations.Nullable;
  
  import javax.swing.*;