merging default into issues_207_238

--HG--
branch : distribute
extra : rebase_source : fc74451584607ea1e96fd0b4449dcde63c3b844f

2 files changed, 76 insertions, 67 deletions

diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt
index 1c9f123d..e99675cc 100644
--- a/distribute.egg-info/entry_points.txt
+++ b/distribute.egg-info/entry_points.txt
@@ -1,61 +1,61 @@
-[distutils.commands]
-bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm
-rotate = setuptools.command.rotate:rotate
-develop = setuptools.command.develop:develop
-setopt = setuptools.command.setopt:setopt
-build_py = setuptools.command.build_py:build_py
-saveopts = setuptools.command.saveopts:saveopts
-egg_info = setuptools.command.egg_info:egg_info
-register = setuptools.command.register:register
-upload_docs = setuptools.command.upload_docs:upload_docs
-install_egg_info = setuptools.command.install_egg_info:install_egg_info
-alias = setuptools.command.alias:alias
-easy_install = setuptools.command.easy_install:easy_install
-install_scripts = setuptools.command.install_scripts:install_scripts
-bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
-bdist_egg = setuptools.command.bdist_egg:bdist_egg
-install = setuptools.command.install:install
-test = setuptools.command.test:test
-install_lib = setuptools.command.install_lib:install_lib
-build_ext = setuptools.command.build_ext:build_ext
-sdist = setuptools.command.sdist:sdist
-
-[egg_info.writers]
-dependency_links.txt = setuptools.command.egg_info:overwrite_arg
-requires.txt = setuptools.command.egg_info:write_requirements
-PKG-INFO = setuptools.command.egg_info:write_pkg_info
-eager_resources.txt = setuptools.command.egg_info:overwrite_arg
-top_level.txt = setuptools.command.egg_info:write_toplevel_names
-namespace_packages.txt = setuptools.command.egg_info:overwrite_arg
-entry_points.txt = setuptools.command.egg_info:write_entries
-depends.txt = setuptools.command.egg_info:warn_depends_obsolete
-
-[console_scripts]
-easy_install = setuptools.command.easy_install:main
-easy_install-2.6 = setuptools.command.easy_install:main
-
-[setuptools.file_finders]
-svn_cvs = setuptools.command.sdist:_default_revctrl
-
-[distutils.setup_keywords]
-dependency_links = setuptools.dist:assert_string_list
-entry_points = setuptools.dist:check_entry_points
-extras_require = setuptools.dist:check_extras
-package_data = setuptools.dist:check_package_data
-install_requires = setuptools.dist:check_requirements
-use_2to3 = setuptools.dist:assert_bool
-use_2to3_fixers = setuptools.dist:assert_string_list
-include_package_data = setuptools.dist:assert_bool
-exclude_package_data = setuptools.dist:check_package_data
-namespace_packages = setuptools.dist:check_nsp
-test_suite = setuptools.dist:check_test_suite
-eager_resources = setuptools.dist:assert_string_list
-zip_safe = setuptools.dist:assert_bool
-test_loader = setuptools.dist:check_importable
-packages = setuptools.dist:check_packages
-convert_2to3_doctests = setuptools.dist:assert_string_list
-tests_require = setuptools.dist:check_requirements
-
-[setuptools.installation]
-eggsecutable = setuptools.command.easy_install:bootstrap
-
+[distutils.commands]

+bdist_rpm = setuptools.command.bdist_rpm:bdist_rpm

+rotate = setuptools.command.rotate:rotate

+develop = setuptools.command.develop:develop

+setopt = setuptools.command.setopt:setopt

+build_py = setuptools.command.build_py:build_py

+saveopts = setuptools.command.saveopts:saveopts

+egg_info = setuptools.command.egg_info:egg_info

+register = setuptools.command.register:register

+upload_docs = setuptools.command.upload_docs:upload_docs

+install_egg_info = setuptools.command.install_egg_info:install_egg_info

+alias = setuptools.command.alias:alias

+easy_install = setuptools.command.easy_install:easy_install

+install_scripts = setuptools.command.install_scripts:install_scripts

+bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst

+bdist_egg = setuptools.command.bdist_egg:bdist_egg

+install = setuptools.command.install:install

+test = setuptools.command.test:test

+install_lib = setuptools.command.install_lib:install_lib

+build_ext = setuptools.command.build_ext:build_ext

+sdist = setuptools.command.sdist:sdist

+

+[egg_info.writers]

+dependency_links.txt = setuptools.command.egg_info:overwrite_arg

+requires.txt = setuptools.command.egg_info:write_requirements

+PKG-INFO = setuptools.command.egg_info:write_pkg_info

+eager_resources.txt = setuptools.command.egg_info:overwrite_arg

+top_level.txt = setuptools.command.egg_info:write_toplevel_names

+namespace_packages.txt = setuptools.command.egg_info:overwrite_arg

+entry_points.txt = setuptools.command.egg_info:write_entries

+depends.txt = setuptools.command.egg_info:warn_depends_obsolete

+

+[console_scripts]

+easy_install = setuptools.command.easy_install:main

+easy_install-2.6 = setuptools.command.easy_install:main

+

+[setuptools.file_finders]

+svn_cvs = setuptools.command.sdist:_default_revctrl

+

+[distutils.setup_keywords]

+dependency_links = setuptools.dist:assert_string_list

+entry_points = setuptools.dist:check_entry_points

+extras_require = setuptools.dist:check_extras

+package_data = setuptools.dist:check_package_data

+install_requires = setuptools.dist:check_requirements

+use_2to3 = setuptools.dist:assert_bool

+use_2to3_fixers = setuptools.dist:assert_string_list

+include_package_data = setuptools.dist:assert_bool

+exclude_package_data = setuptools.dist:check_package_data

+namespace_packages = setuptools.dist:check_nsp

+test_suite = setuptools.dist:check_test_suite

+eager_resources = setuptools.dist:assert_string_list

+zip_safe = setuptools.dist:assert_bool

+test_loader = setuptools.dist:check_importable

+packages = setuptools.dist:check_packages

+convert_2to3_doctests = setuptools.dist:assert_string_list

+tests_require = setuptools.dist:check_requirements

+

+[setuptools.installation]

+eggsecutable = setuptools.command.easy_install:bootstrap

+

diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index 85616605..1ae0ba70 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -67,7 +67,7 @@ class TestEasyInstallTest(unittest.TestCase):
 
         old_platform = sys.platform
         try:
-            name, script = get_script_args(dist).next()
+            name, script = get_script_args(dist).next()[0:2]
         finally:
             sys.platform = old_platform
 
@@ -141,9 +141,13 @@ class TestPTHFileWriter(unittest.TestCase):
         self.assert_(pth.dirty)
 
     def test_add_from_site_is_ignored(self):
-        pth = PthDistributions('does-not_exist', ['/test/location/does-not-have-to-exist'])
+        if os.name != 'nt':
+            location = '/test/location/does-not-have-to-exist'
+        else:
+            location = 'c:\\does_not_exist'
+        pth = PthDistributions('does-not_exist', [location, ])
         self.assert_(not pth.dirty)
-        pth.add(PRDistribution('/test/location/does-not-have-to-exist'))
+        pth.add(PRDistribution(location))
         self.assert_(not pth.dirty)
 
 
@@ -221,7 +225,7 @@ class TestUserInstallTest(unittest.TestCase):
 
         sys.path.append(target)
         old_ppath = os.environ.get('PYTHONPATH')
-        os.environ['PYTHONPATH'] = ':'.join(sys.path)
+        os.environ['PYTHONPATH'] = os.path.pathsep.join(sys.path)
         try:
             dist = Distribution()
             dist.script_name = 'setup.py'
@@ -234,8 +238,13 @@ class TestUserInstallTest(unittest.TestCase):
             self.assertEquals(res.location, new_location)
         finally:
             sys.path.remove(target)
-            shutil.rmtree(new_location)
-            shutil.rmtree(target)
+            for basedir in [new_location, target, ]:
+                if not os.path.exists(basedir) or not os.path.isdir(basedir):
+                    continue
+                try:
+                    shutil.rmtree(basedir)
+                except:
+                    pass
             if old_ppath is not None:
                 os.environ['PYTHONPATH'] = old_ppath
             else: