MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

Separate error messages for missing 'pip' and 'distribute' (PY-5931)

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2012-03-20 20:50:24 +04:00
parent 8a5e7dbec0
commit 1136fbeaac
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/helpers/packaging_tool.py
View File

@@ -15,13 +15,13 @@ def error(message, retcode):
sys.exit(retcode)
def error_no_pip():
error("Python package management tool 'pip' not found. Please install 'pip'", ERROR_NO_PACKAGING_TOOLS)
error("Python package management tool 'pip' not found. Please install 'pip' manually", ERROR_NO_PACKAGING_TOOLS)
def do_list():
try:
import pkg_resources
except ImportError:
error("Python package management tools not found. Please install 'setuptools' or 'distribute'", ERROR_NO_PACKAGING_TOOLS)
error("Python package management tools not found. Please install 'setuptools' or 'distribute' manually", ERROR_NO_PACKAGING_TOOLS)
for pkg in pkg_resources.working_set:
print('\t'.join([pkg.project_name, pkg.version, pkg.location]))

12
python/src/com/jetbrains/python/packaging/PyPackageManager.java
View File

@@ -257,16 +257,12 @@ public class PyPackageManager {
}
@Nullable
public PyPackage findPackage(String name) {
try {
for (PyPackage pkg : getPackages()) {
if (name.equals(pkg.getName())) {
return pkg;
}
public PyPackage findPackage(String name) throws PyExternalProcessException {
for (PyPackage pkg : getPackages()) {
if (name.equals(pkg.getName())) {
return pkg;
}
}
catch (PyExternalProcessException ignored) {
}
return null;
}