pypy home scheme fix

Author: qwcode

pip/backwardcompat.py

@@ -1,5 +1,6 @@
 """Stuff that differs in different Python versions"""
 
+import os
 import sys
 import site
 
@@ -98,3 +99,11 @@ def product(*args, **kwds):
         result = [x+[y] for x in result for y in pool]
     for prod in result:
         yield tuple(prod)
+
+def home_lib(home):
+    """Return the lib dir under the 'home' installation scheme"""
+    if hasattr(sys, 'pypy_version_info'):
+        lib = 'site-packages'
+    else:
+        lib = os.path.join('lib', 'python')
+    return os.path.join(home, lib)

pip/commands/install.py

@@ -9,6 +9,7 @@
 from pip.basecommand import Command
 from pip.index import PackageFinder
 from pip.exceptions import InstallationError, CommandError
+from pip.backwardcompat import home_lib
 
 
 class InstallCommand(Command):
@@ -276,7 +277,7 @@ def run(self, options, args):
         if options.target_dir:
             if not os.path.exists(options.target_dir):
                 os.makedirs(options.target_dir)
-            lib_dir = os.path.join(temp_target_dir, "lib/python/")
+            lib_dir = home_lib(temp_target_dir)
             for item in os.listdir(lib_dir):
                 shutil.move(
                     os.path.join(lib_dir, item),