[Python-checkins] python/nondist/sandbox/setuptools easy_install.py, 1.27, 1.28 setup.py, 1.39, 1.40

[pje@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/setuptools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25640

Modified Files:
	easy_install.py setup.py 
Log Message:
Improve backward compatibility, so that users running easy_install.py or
python -m easy_install get a clearer error message.


Index: easy_install.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/easy_install.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- easy_install.py	17 Sep 2005 01:13:02 -0000	1.27
+++ easy_install.py	24 Sep 2005 17:28:56 -0000	1.28
@@ -1,22 +1,15 @@
 #!python
 """\
-
-Easy Install
-------------
-
-A tool for doing automatic download/extract/build of distutils-based Python
-packages.  For detailed documentation, see the accompanying EasyInstall.txt
-file, or visit the `EasyInstall home page`__.
-
-__ http://peak.telecommunity.com/DevCenter/EasyInstall
+This script/module exists for backward compatibility only!  It will go away
+entirely in 0.7.  Please start using the 'easy_install' script or .exe instead
+of using 'python -m easy_install' or running 'easy_install.py' directly.
 """
 
-import sys
-from setuptools.command.easy_install import *
-
 if __name__ == '__main__':
-    print >>sys.stderr, "NOTE: python -m easy_install is deprecated."
-    print >>sys.stderr, "Please use the 'easy_install' command instead."
-    print >>sys.stderr
-    main(sys.argv[1:])
+    import sys
+    print >>sys.stderr, \
+        "Please use the 'easy_install' script or executable instead."
+    print >>sys.stderr, \
+        "(i.e., don't include the '.py' extension and don't use 'python -m')"
+    sys.exit(2)
 

Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setup.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- setup.py	18 Sep 2005 04:02:38 -0000	1.39
+++ setup.py	24 Sep 2005 17:28:56 -0000	1.40
@@ -14,13 +14,14 @@
         lines.append(line)
     f.close()
     return ''.join(lines)
-    
-VERSION = "0.6a2"
 
+VERSION = "0.6a2"
 from setuptools import setup, find_packages
 import sys
-
 from setuptools.command import __all__ as SETUP_COMMANDS
+scripts = []
+if sys.platform != "win32":
+    scripts = ["easy_install.py"]   # for backward compatibility only
 
 setup(
     name="setuptools",
@@ -38,7 +39,6 @@
     package_data = {'setuptools': ['launcher.exe']},
     py_modules = ['pkg_resources', 'easy_install'],
 
-    
     zip_safe = False,   # We want 'python -m easy_install' to work, for now :(
     entry_points = {
         "distutils.commands" : [
@@ -77,8 +77,8 @@
     Topic :: Software Development :: Libraries :: Python Modules
     Topic :: System :: Archiving :: Packaging
     Topic :: System :: Systems Administration
-    Topic :: Utilities""".splitlines() if f.strip()]
-
+    Topic :: Utilities""".splitlines() if f.strip()],
+    scripts = scripts,
 
     # uncomment for testing
     # setup_requires = ['setuptools>=0.6a0'],