diff options
| author | tarek <none@none> | 2009-09-20 14:47:00 +0200 |
|---|---|---|
| committer | tarek <none@none> | 2009-09-20 14:47:00 +0200 |
| commit | 1219c326683905695fbdf60c22367129075d2f8d (patch) | |
| tree | cf4c19815da32edf7c917a8ca080c2f99dc3ce05 | |
| parent | 19af16b0ec4149f3b00d4e05dfce8ad4f61310e1 (diff) | |
| download | external_python_setuptools-1219c326683905695fbdf60c22367129075d2f8d.tar.gz external_python_setuptools-1219c326683905695fbdf60c22367129075d2f8d.tar.bz2 external_python_setuptools-1219c326683905695fbdf60c22367129075d2f8d.zip | |
merged + removed trailing spaces
--HG--
branch : distribute
extra : rebase_source : 343481c01063bac16767023dd7a24bb0b063b967
| -rw-r--r-- | distribute.egg-info/entry_points.txt | 2 | ||||
| -rwxr-xr-x | setuptools/command/develop.py | 6 | ||||
| -rw-r--r-- | tests/test_distribute_setup.py | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/distribute.egg-info/entry_points.txt b/distribute.egg-info/entry_points.txt index d69118d9..3532a1fe 100644 --- a/distribute.egg-info/entry_points.txt +++ b/distribute.egg-info/entry_points.txt @@ -31,7 +31,7 @@ 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 +easy_install-2.7 = setuptools.command.easy_install:main [setuptools.file_finders] svn_cvs = setuptools.command.sdist:_default_revctrl diff --git a/setuptools/command/develop.py b/setuptools/command/develop.py index f128b803..32888056 100755 --- a/setuptools/command/develop.py +++ b/setuptools/command/develop.py @@ -46,7 +46,7 @@ class develop(easy_install): "Please rename %r to %r before using 'develop'" % (ei.egg_info, ei.broken_egg_info) ) - self.args = [ei.egg_name] + self.args = [ei.egg_name] easy_install.finalize_options(self) # pick up setup-dir .egg files only: no .egg-info self.package_index.scan(glob.glob('*.egg')) @@ -62,7 +62,7 @@ class develop(easy_install): "--egg-path must be a relative path from the install" " directory to "+target ) - + # Make a distribution for the package's source self.dist = Distribution( target, @@ -129,7 +129,7 @@ class develop(easy_install): # create wrapper scripts in the script dir, pointing to dist.scripts # new-style... - self.install_wrapper_scripts(dist) + self.install_wrapper_scripts(dist) # ...and old-style for script_name in self.distribution.scripts or []: diff --git a/tests/test_distribute_setup.py b/tests/test_distribute_setup.py index 6c004bd7..76f8f8fa 100644 --- a/tests/test_distribute_setup.py +++ b/tests/test_distribute_setup.py @@ -45,7 +45,6 @@ class TestSetup(unittest.TestCase): self.assert_(setuptools.__file__.startswith(egg)) def test_do_download(self): - tmpdir = tempfile.mkdtemp() _do_download(to_dir=tmpdir) import setuptools |