1 files changed, 8 insertions, 7 deletions
diff --git a/python/src/com/jetbrains/python/packaging/ui/PyPackageManagementService.java b/python/src/com/jetbrains/python/packaging/ui/PyPackageManagementService.java
index ffd291a995b1..95330b361dfb 100644
--- a/python/src/com/jetbrains/python/packaging/ui/PyPackageManagementService.java
+++ b/python/src/com/jetbrains/python/packaging/ui/PyPackageManagementService.java
@@ -23,6 +23,7 @@ import com.intellij.webcore.packaging.InstalledPackage;
 import com.intellij.webcore.packaging.PackageManagementService;
 import com.intellij.webcore.packaging.RepoPackage;
 import com.jetbrains.python.packaging.*;
+import com.jetbrains.python.sdk.PySdkUtil;
 import com.jetbrains.python.sdk.PythonSdkType;
 import org.apache.xmlrpc.AsyncCallback;
 import org.jetbrains.annotations.NonNls;
@@ -112,7 +113,7 @@ public class PyPackageManagementService extends PackageManagementService {
   public String getInstallToUserText() {
     String userSiteText = "Install to user's site packages directory";
     if (!PythonSdkType.isRemote(mySdk))
-      userSiteText += " (" + PyPackageManagerImpl.getUserSite() + ")";
+      userSiteText += " (" + PySdkUtil.getUserSite() + ")";
     return userSiteText;
   }
 
@@ -130,12 +131,12 @@ public class PyPackageManagementService extends PackageManagementService {
   public Collection<InstalledPackage> getInstalledPackages() throws IOException {
     List<PyPackage> packages;
     try {
-      packages = ((PyPackageManagerImpl)PyPackageManager.getInstance(mySdk)).getPackages();
+      packages = PyPackageManager.getInstance(mySdk).getPackages(false);
     }
     catch (PyExternalProcessException e) {
       throw new IOException(e);
     }
-    return new ArrayList<InstalledPackage>(packages);
+    return packages != null ? new ArrayList<InstalledPackage>(packages) : new ArrayList<InstalledPackage>();
   }
 
   @Override
@@ -145,7 +146,7 @@ public class PyPackageManagementService extends PackageManagementService {
     final String repository = PyPIPackageUtil.PYPI_URL.equals(repoPackage.getRepoUrl()) ? null : repoPackage.getRepoUrl();
     final List<String> extraArgs = new ArrayList<String>();
     if (installToUser) {
-      extraArgs.add(PyPackageManagerImpl.USE_USER_SITE);
+      extraArgs.add(PyPackageManager.USE_USER_SITE);
     }
     if (extraOptions != null) {
       // TODO: Respect arguments quotation
@@ -166,7 +167,7 @@ public class PyPackageManagementService extends PackageManagementService {
       req = new PyRequirement(packageName);
     }
 
-    final PyPackageManagerImpl.UI ui = new PyPackageManagerImpl.UI(myProject, mySdk, new PyPackageManagerImpl.UI.Listener() {
+    final PyPackageManagerUI ui = new PyPackageManagerUI(myProject, mySdk, new PyPackageManagerUI.Listener() {
       @Override
       public void started() {
         listener.operationStarted(packageName);
@@ -183,7 +184,7 @@ public class PyPackageManagementService extends PackageManagementService {
   private String toErrorDescription(List<PyExternalProcessException> exceptions) {
     String errorDescription = null;
     if (exceptions != null && exceptions.size() > 0) {
-      errorDescription = PyPackageManagerImpl.UI.createDescription(exceptions, "");
+      errorDescription = PyPackageManagerUI.createDescription(exceptions, "");
     }
     return errorDescription;
   }
@@ -191,7 +192,7 @@ public class PyPackageManagementService extends PackageManagementService {
   @Override
   public void uninstallPackages(List<InstalledPackage> installedPackages, final Listener listener) {
     final String packageName = installedPackages.size() == 1 ? installedPackages.get(0).getName() : null;
-    PyPackageManagerImpl.UI ui = new PyPackageManagerImpl.UI(myProject, mySdk, new PyPackageManagerImpl.UI.Listener() {
+    PyPackageManagerUI ui = new PyPackageManagerUI(myProject, mySdk, new PyPackageManagerUI.Listener() {
       @Override
       public void started() {
         listener.operationStarted(packageName);