Skip to content

Commit acc9172

Browse files
committed
Merge pull request #903 from qwcode/home_lib
improve method for getting home scheme purelib
2 parents 5b3a6e9 + fd933a9 commit acc9172

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

pip/backwardcompat/__init__.py

-9
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,6 @@ def product(*args, **kwds):
118118
yield tuple(prod)
119119

120120

121-
def home_lib(home):
122-
"""Return the lib dir under the 'home' installation scheme"""
123-
if hasattr(sys, 'pypy_version_info'):
124-
lib = 'site-packages'
125-
else:
126-
lib = os.path.join('lib', 'python')
127-
return os.path.join(home, lib)
128-
129-
130121
## only >=py32 has ssl.match_hostname and ssl.CertificateError
131122
try:
132123
from ssl import match_hostname, CertificateError

pip/commands/install.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@
44
import shutil
55
from pip.req import InstallRequirement, RequirementSet, parse_requirements
66
from pip.log import logger
7-
from pip.locations import src_prefix, virtualenv_no_global
7+
from pip.locations import src_prefix, virtualenv_no_global, distutils_scheme
88
from pip.basecommand import Command
99
from pip.index import PackageFinder
1010
from pip.exceptions import InstallationError, CommandError
11-
from pip.backwardcompat import home_lib
1211
from pip import cmdoptions
1312

1413

@@ -256,7 +255,7 @@ def run(self, options, args):
256255
if options.target_dir:
257256
if not os.path.exists(options.target_dir):
258257
os.makedirs(options.target_dir)
259-
lib_dir = home_lib(temp_target_dir)
258+
lib_dir = distutils_scheme('', home=temp_target_dir)['purelib']
260259
for item in os.listdir(lib_dir):
261260
shutil.move(
262261
os.path.join(lib_dir, item),

0 commit comments

Comments
 (0)