Anonymous avatar Anonymous committed e952f54

make sure USER_SITE is listed as a sitedir in easy_install

Comments (0)

Files changed (3)

setuptools/command/develop.py

             % (ei.egg_info, ei.broken_egg_info)
             )
         self.args = [ei.egg_name]
-        easy_install.finalize_options(self)
+
 
         py_version = sys.version.split()[0]
         prefix, exec_prefix = get_config_vars('prefix', 'exec_prefix')
             self.install_dir = self.install_purelib
             self.script_dir = self.install_scripts
 
+        easy_install.finalize_options(self)
         # pick up setup-dir .egg files only: no .egg-info
         self.package_index.scan(glob.glob('*.egg'))
 

setuptools/command/easy_install.py

         site_lib = get_python_lib(plat_specific)
         if site_lib not in sitedirs: sitedirs.append(site_lib)
 
+    if sys.version >= "2.6":
+        import site
+        sitedirs.append(site.USER_SITE)
+
     sitedirs = map(normalize_path, sitedirs)
+
     return sitedirs
 
 

setuptools/tests/test_develop.py

 
         # let's see if we got our egg link at the right place
         content = os.listdir(site.USER_SITE)
-        self.assertEquals(content, ['UNKNOWN.egg-link'])
+        content.sort()
+        self.assertEquals(content, ['UNKNOWN.egg-link', 'easy-install.pth'])
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.