McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Add back `user_site` for locations and util

This commit is contained in:
Matthew Iversen 2014-04-16 07:59:56 +10:00
parent bcc1a4018c
commit 5d30c43fff
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pip/locations.py
View File

@ -130,14 +130,15 @@ src_prefix = os.path.abspath(src_prefix)
# FIXME doesn't account for venv linked to global site-packages
site_packages = sysconfig.get_python_lib()
user_site = site.USER_SITE
user_dir = os.path.expanduser('~')
if sys.platform == 'win32':
bin_py = os.path.join(sys.prefix, 'Scripts')
bin_user = os.path.join(site.USER_SITE, 'Scripts')
bin_user = os.path.join(user_site, 'Scripts')
# buildout uses 'bin' on Windows too?
if not os.path.exists(bin_py):
bin_py = os.path.join(sys.prefix, 'bin')
bin_user = os.path.join(site.USER_SITE, 'bin')
bin_user = os.path.join(user_site, 'bin')
default_storage_dir = os.path.join(user_dir, 'pip')
default_config_basename = 'pip.ini'
default_config_file = os.path.join(
@ -147,7 +148,7 @@ if sys.platform == 'win32':
default_log_file = os.path.join(default_storage_dir, 'pip.log')
else:
bin_py = os.path.join(sys.prefix, 'bin')
bin_user = os.path.join(site.USER_SITE, 'bin')
bin_user = os.path.join(user_site, 'bin')
default_storage_dir = os.path.join(user_dir, '.pip')
default_config_basename = 'pip.conf'
default_config_file = os.path.join(

5
pip/util.py
View File

@ -3,7 +3,6 @@ import re
import os
import posixpath
import shutil
import site
import stat
import subprocess
import sys
@ -16,7 +15,7 @@ from pip.backwardcompat import(
PermissionError, stdlib_pkgs
)
from pip.locations import (
site_packages, running_under_virtualenv, virtualenv_no_global,
site_packages, user_site, running_under_virtualenv, virtualenv_no_global,
write_delete_marker_file
)
from pip.log import logger
@ -343,7 +342,7 @@ def dist_in_usersite(dist):
Return True if given Distribution is installed in user site.
"""
norm_path = normalize_path(dist_location(dist))
return norm_path.startswith(normalize_path(site.USER_SITE))
return norm_path.startswith(normalize_path(user_site))
def dist_in_site_packages(dist):