Made ``easy_install`` a standard ``setuptools`` command, moving it from

the ``easy_install`` module to ``setuptools.command.easy_install``.  Note
that if you were importing or extending it, you must now change your
imports accordingly.  ``easy_install.py`` is still installed as a script,
but not as a module.


git-svn-id: http://svn.python.org/projects/sandbox/trunk/setuptools@41079 6015fed2-1504-0410-9fe1-9d1591cc4771

1 files changed, 3 insertions, 3 deletions

diff --git a/ez_setup.py b/ez_setup.py
index d0c98b1..4efc388 100755
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -132,7 +132,7 @@ def main(argv, version=DEFAULT_VERSION):
         try:
             egg = download_setuptools(version, to_dir=tmpdir)
             sys.path.insert(0,egg)
-            from easy_install import main
+            from setuptools.command.easy_install import main
             main(list(argv)+[egg])
         finally:
             shutil.rmtree(tmpdir)
@@ -146,12 +146,12 @@ def main(argv, version=DEFAULT_VERSION):
     try:
         pkg_resources.require(req)
     except pkg_resources.VersionConflict:
-        from easy_install import main
+        from setuptools.command.easy_install import main
         main(list(argv)+[req])
         sys.exit(0) # try to force an exit
     else:
         if argv:
-            from easy_install import main
+            from setuptools.command.easy_install import main
             main(argv)
         else:
             print "Setuptools successfully installed or upgraded."